diff options
128 files changed, 9225 insertions, 838 deletions
diff --git a/redhat/applications/amarok/amarok-3.5.13-adds_ruby_1.9_support.patch b/redhat/applications/amarok/amarok-3.5.13-adds_ruby_1.9_support.patch new file mode 100644 index 000000000..c18b57d57 --- /dev/null +++ b/redhat/applications/amarok/amarok-3.5.13-adds_ruby_1.9_support.patch @@ -0,0 +1,138 @@ +--- amarok/amarok/src/mediadevice/daap/mongrel/http11/CMakeLists.txt.ORI 2012-05-01 11:32:31.604163233 +0200 ++++ amarok/amarok/src/mediadevice/daap/mongrel/http11/CMakeLists.txt 2012-05-01 11:32:39.764016446 +0200 +@@ -16,6 +16,7 @@ + + include_directories( + ${RUBY_INCLUDE_DIR} ++ ${RUBY_ARCH_INCLUDE_DIR} + ) + + ##### other data ################################ +--- amarok/amarok/src/mediadevice/daap/ConfigureChecks.cmake.ruby 2011-05-03 07:45:53.000000000 +0200 ++++ amarok/amarok/src/mediadevice/daap/ConfigureChecks.cmake 2012-05-01 17:12:11.980323997 +0200 +@@ -32,8 +32,33 @@ + tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" ) + endif( ) + ++execute_process( ++ COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MAJOR'] )" ++ OUTPUT_VARIABLE RUBY_MAJOR_VERSION ++ RESULT_VARIABLE _result ++ OUTPUT_STRIP_TRAILING_WHITESPACE) ++if( _result ) ++ tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" ) ++endif( ) ++ ++execute_process( ++ COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MINOR'] )" ++ OUTPUT_VARIABLE RUBY_MINOR_VERSION ++ RESULT_VARIABLE _result ++ OUTPUT_STRIP_TRAILING_WHITESPACE) ++if( _result ) ++ tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" ) ++endif( ) ++ + if( RUBY_INCLUDE_DIR AND RUBY_LDFLAGS ) + message( STATUS "Found RUBY: ${RUBY_EXECUTABLE}" ) + message( STATUS " RUBY_INCLUDE_DIR: ${RUBY_INCLUDE_DIR}" ) + message( STATUS " RUBY_LDFLAGS: ${RUBY_LDFLAGS}" ) ++ message( STATUS " RUBY_MAJOR_VERSION: ${RUBY_MAJOR_VERSION}") ++ message( STATUS " RUBY_MINOR_VERSION: ${RUBY_MINOR_VERSION}") + endif( ) ++ ++if ( "${RUBY_MAJOR_VERSION}.${RUBY_MINOR_VERSION}" VERSION_LESS "1.9" ) ++ message( STATUS " You have an old version of Ruby ! (<1.9)") ++ set ( HAVE_OLD_RUBY 1 CACHE INTERNAL "" ) ++endif( ) +--- amarok/config.h.cmake.ORI 2012-05-01 17:12:53.044914450 +0200 ++++ amarok/config.h.cmake 2012-05-01 17:13:08.307133030 +0200 +@@ -16,3 +16,5 @@ + + #cmakedefine TAGLIB_15 1 + #cmakedefine HAVE_QGLWIDGET 1 ++ ++#cmakedefine HAVE_OLD_RUBY @HAVE_OLD_RUBY@ +--- amarok/amarok/src/mediadevice/daap/mongrel/http11/CMakeLists.txt.ORI 2012-05-01 18:34:12.577433198 +0200 ++++ amarok/amarok/src/mediadevice/daap/mongrel/http11/CMakeLists.txt 2012-05-01 18:34:23.840269058 +0200 +@@ -15,6 +15,7 @@ + ) + + include_directories( ++ ${CMAKE_BINARY_DIR} + ${RUBY_INCLUDE_DIR} + ${RUBY_ARCH_INCLUDE_DIR} + ) +--- amarok/amarok/src/mediadevice/daap/mongrel/http11/http11.c.ruby 2011-09-19 06:40:11.000000000 +0200 ++++ amarok/amarok/src/mediadevice/daap/mongrel/http11/http11.c 2012-05-01 16:25:32.486067476 +0200 +@@ -2,6 +2,7 @@ + * Copyright (c) 2005 Zed A. Shaw + * You can redistribute it and/or modify it under the same terms as Ruby. + */ ++#include "config.h" + #include "ruby.h" + #include "ext_help.h" + #include <assert.h> +@@ -74,7 +75,11 @@ + f = rb_str_dup(global_http_prefix); + f = rb_str_buf_cat(f, field, flen); + ++#ifdef HAVE_OLD_RUBY + for(ch = RSTRING(f)->ptr, end = ch + RSTRING(f)->len; ch < end; ch++) { ++#else ++ for(ch = RSTRING_PTR(f), end = ch + RSTRING_LEN(f); ch < end; ch++) { ++#endif + if(*ch == '-') { + *ch = '_'; + } else { +@@ -157,12 +162,25 @@ + + rb_hash_aset(req, global_gateway_interface, global_gateway_interface_value); + if((temp = rb_hash_aref(req, global_http_host)) != Qnil) { ++#ifdef HAVE_OLD_RUBY + colon = strchr(RSTRING(temp)->ptr, ':'); ++#else ++ colon = strchr(RSTRING_PTR(temp), ':'); ++#endif + if(colon != NULL) { ++#ifdef HAVE_OLD_RUBY + rb_hash_aset(req, global_server_name, rb_str_substr(temp, 0, colon - RSTRING(temp)->ptr)); ++#else ++ rb_hash_aset(req, global_server_name, rb_str_substr(temp, 0, colon - RSTRING_PTR(temp))); ++#endif + rb_hash_aset(req, global_server_port, ++#ifdef HAVE_OLD_RUBY + rb_str_substr(temp, colon - RSTRING(temp)->ptr+1, + RSTRING(temp)->len)); ++#else ++ rb_str_substr(temp, colon - RSTRING_PTR(temp)+1, ++ RSTRING_LEN(temp))); ++#endif + } else { + rb_hash_aset(req, global_server_name, temp); + rb_hash_aset(req, global_server_port, global_port_80); +@@ -281,8 +299,13 @@ + DATA_GET(self, http_parser, http); + + from = FIX2INT(start); ++#ifdef HAVE_OLD_RUBY + dptr = RSTRING(data)->ptr; + dlen = RSTRING(data)->len; ++#else ++ dptr = RSTRING_PTR(data); ++ dlen = RSTRING_LEN(data); ++#endif + + if(from >= dlen) { + rb_raise(eHttpParserError, "Requested start is after data buffer end."); +@@ -512,7 +535,11 @@ + if(pref_len == 1 && uri_str[0] == '/') { + rb_ary_push(result, uri); + } else { ++#ifdef HAVE_OLD_RUBY + rb_ary_push(result, rb_str_substr(uri, pref_len, RSTRING(uri)->len)); ++#else ++ rb_ary_push(result, rb_str_substr(uri, pref_len, RSTRING_LEN(uri))); ++#endif + } + + rb_ary_push(result, (VALUE)handler); diff --git a/redhat/applications/amarok/amarok-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/amarok/amarok-3.5.13-fix_gcc47_compilation.patch new file mode 100644 index 000000000..79cfb5940 --- /dev/null +++ b/redhat/applications/amarok/amarok-3.5.13-fix_gcc47_compilation.patch @@ -0,0 +1,11 @@ +--- amarok/amarok/src/mediadevice/mtp/mtpmediadevice.cpp.ORI 2012-05-01 11:44:16.868838499 +0200 ++++ amarok/amarok/src/mediadevice/mtp/mtpmediadevice.cpp 2012-05-01 11:44:27.427731738 +0200 +@@ -24,6 +24,8 @@ + + #define DEBUG_PREFIX "MtpMediaDevice" + ++#include <stdlib.h> ++ + #include <config.h> + #include "mtpmediadevice.h" + diff --git a/redhat/applications/amarok/amarok-3.5.13-fix_inotify_support.patch b/redhat/applications/amarok/amarok-3.5.13-fix_inotify_support.patch new file mode 100644 index 000000000..46798b363 --- /dev/null +++ b/redhat/applications/amarok/amarok-3.5.13-fix_inotify_support.patch @@ -0,0 +1,37 @@ +commit 899586da27ae7a85cea8637849a964a88f3df8b2 +Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Date: 1326222183 -0600 + + Fix inotify detection + +diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake +index 0e14311..090c73b 100644 +--- a/ConfigureChecks.cmake ++++ b/ConfigureChecks.cmake +@@ -21,7 +21,25 @@ check_type_size( "long" SIZEOF_LONG BUILTIN_TYPES_ONLY ) + + check_include_file( stdint.h HAVE_STDINT_H ) + check_include_file( systems.h HAVE_SYSTEMS_H ) +-check_include_file( linux/inotify.h HAVE_INOTIFY ) ++ ++##### check for inotify ########################### ++ ++# if( WITH_INOTIFY ) ++ check_include_file( "inotify.h" INOTIFY_FOUND ) ++ check_include_file( "sys/inotify.h" INOTIFY_SYS_FOUND ) ++ if( NOT INOTIFY_FOUND ) ++ if( NOT INOTIFY_SYS_FOUND ) ++ message(FATAL_ERROR "\ninotify support was requested, but inotify was not found on your system" ) ++ endif( NOT INOTIFY_SYS_FOUND ) ++ endif( NOT INOTIFY_FOUND ) ++ if( INOTIFY_FOUND ) ++ set( HAVE_INOTIFY 1 ) ++ endif( INOTIFY_FOUND ) ++ if( INOTIFY_SYS_FOUND ) ++ set( HAVE_INOTIFY 1 ) ++ set( HAVE_SYS_INOTIFY 1 ) ++ endif( INOTIFY_SYS_FOUND ) ++# endif( ) + + check_function_exists( statvfs HAVE_STATVFS ) + diff --git a/redhat/applications/amarok/trinity-amarok.spec b/redhat/applications/amarok/trinity-amarok.spec index 1dfa40e1d..c70828000 100644 --- a/redhat/applications/amarok/trinity-amarok.spec +++ b/redhat/applications/amarok/trinity-amarok.spec @@ -1,12 +1,12 @@ # Basic package informations %define kdecomp amarok %define version 1.4.10 -%define release 5 +%define release 6 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc +%define _docdir %{_datadir}/doc %endif # TDE 3.5.13 specific building variables @@ -15,6 +15,9 @@ BuildRequires: cmake >= 2.8 %define tde_includedir %{_includedir}/kde %define tde_libdir %{_libdir}/trinity +# Ruby 1.9 includes are located in strance directories ... (taken from ruby 1.9 spec file) +%global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/') + Name: trinity-%{kdecomp} Summary: Media player @@ -38,12 +41,20 @@ Patch3: amarok-3.5.13-taglib_include.patch Patch4: amarok-3.5.13-enable_riokarma.patch Patch5: amarok-3.5.13-enable_akode.patch +Patch6: amarok-3.5.13-adds_ruby_1.9_support.patch +Patch7: amarok-3.5.13-fix_gcc47_compilation.patch + +# [amarok] Fix inotify detection [Commit #899586da] +Patch11: amarok-3.5.13-fix_inotify_support.patch + BuildRequires: alsa-lib-devel BuildRequires: desktop-file-utils BuildRequires: esound-devel BuildRequires: gettext +BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-kdebase-devel +BuildRequires: pcre-devel BuildRequires: taglib-devel BuildRequires: libifp-devel # Ipod @@ -67,19 +78,15 @@ BuildRequires: libusb-devel BuildRequires: libvisual-devel BuildRequires: mysql-devel BuildRequires: postgresql-devel -BuildRequires: ruby-devel ruby BuildRequires: SDL-devel BuildRequires: taglib-devel BuildRequires: sqlite-devel -BuildRequires: libkarma-devel karma-sharp +BuildRequires: trinity-libkarma-devel karma-sharp # not used anymore, in favor of libvisual ? -- Rex #%{?fedora:BuildRequires: xmms-devel} BuildRequires: dbus-devel BuildRequires: dbus-tqt-devel -BuildRequires: akode-devel - -# For dir ownership and some default plugins (lyrics), -ruby subpkg? -- Rex -Requires: ruby +BuildRequires: trinity-akode-devel # To open the selected browser, works with Patch2 Requires: xdg-utils @@ -114,6 +121,17 @@ Amarok is a multimedia player with: - nice GUI, integrates into the KDE look, but with a unique touch +%package ruby +Summary: %{name} Ruby support +Group: Applications/Multimedia +BuildRequires: ruby-devel ruby +Requires: %{name} = %{version}-%{release} +# For dir ownership and some default plugins (lyrics) +Requires: ruby +%description ruby +%{summary}. + + %package konqueror Summary: Amarok konqueror (service menus, sidebar) support Group: Applications/Multimedia @@ -140,6 +158,10 @@ use any of xmms' visualisation plugins with Amarok. %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 -b .ruby +%patch7 -p1 + +%patch11 -p1 -b .inotify %build @@ -163,7 +185,8 @@ cd build -DWITH_RIOKARMA=ON \ -DWITH_DAAP=ON \ -DBUILD_ALL=ON \ - -DQT_LIBRARY_DIRS=${QTLIB} \ + -DQT_LIBRARY_DIRS="${QTLIB}" \ + -DRUBY_ARCH_INCLUDE_DIR="%{_usr}/include/%{_normalized_cpu}-%{_target_os}" \ .. %__make %{?_smp_mflags} @@ -234,8 +257,6 @@ xdg-desktop-menu forceupdate 2> /dev/null || : %{_datadir}/services/amarokpcast.protocol # -libs ? -- Rex %{_libdir}/libamarok.* -# -ruby ? -- Rex -%{_libdir}/ruby_lib/* # DAAP %{_bindir}/amarok_daapserver.rb %{tde_libdir}/libamarok_daap-mediadevice.* @@ -283,6 +304,9 @@ xdg-desktop-menu forceupdate 2> /dev/null || : %{_datadir}/services/amarok_aKode-engine.desktop %{tde_libdir}/libamarok_aKode-engine.* +%files ruby +%defattr(-,root,root,-) +%{_libdir}/ruby_lib/* %files konqueror @@ -297,6 +321,11 @@ xdg-desktop-menu forceupdate 2> /dev/null || : %changelog +* Mon Apr 29 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.10-6 +- Rebuilt for Fedora 17 +- Fix compilation with GCC 4.7 +- Fix inotify detection [Commit #899586da] + * Mon Mar 19 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.10-5 - Replaces BR "libgpod" with "trinity-libgpod" for EL5 diff --git a/redhat/applications/basket/basket-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/basket/basket-3.5.13-fix_gcc47_compilation.patch new file mode 100644 index 000000000..f9706285f --- /dev/null +++ b/redhat/applications/basket/basket-3.5.13-fix_gcc47_compilation.patch @@ -0,0 +1,10 @@ +--- basket/src/likeback.cpp.ORI 2012-05-01 13:57:36.852590875 +0200 ++++ basket/src/likeback.cpp 2012-05-01 13:57:51.403632210 +0200 +@@ -50,6 +50,7 @@ + #include <pwd.h> + + #include <iostream> ++#include <unistd.h> + + #include "likeback.h" + #include "likeback_private.h" diff --git a/redhat/applications/basket/trinity-basket-3.5.13.spec b/redhat/applications/basket/trinity-basket-3.5.13.spec index 49cbcf219..127bf4b30 100644 --- a/redhat/applications/basket/trinity-basket-3.5.13.spec +++ b/redhat/applications/basket/trinity-basket-3.5.13.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp basket %define version 1.0.3.1 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -33,6 +33,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz +# [basket] Fix compilation with GCC 4.7 +Patch1: basket-3.5.13-fix_gcc47_compilation.patch + BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-kdebase-devel @@ -53,15 +56,16 @@ baskets to HTML. %prep %setup -q -n applications/%{kdecomp} +%patch1 -p1 # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -88,13 +92,17 @@ export PATH="%{_bindir}:${PATH}" %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in crystalsvg ; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done /sbin/ldconfig %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in crystalsvg ; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done /sbin/ldconfig @@ -104,7 +112,7 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_bindir}/* %{_datadir}/applications/*/*.desktop %{_datadir}/apps/*/ -%{_datadir}/icons/*/*/*/* +%{_datadir}/icons/crystalsvg/*/*/* %{_datadir}/locale/*/*/*.mo %{tde_docdir}/HTML/en/*/ %{_datadir}/services/*.desktop @@ -119,6 +127,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-2 +- Fix build, post and postun +- Fix compilation with GCC 4.7 + * Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/bibletime/bibletime-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/bibletime/bibletime-3.5.13-fix_gcc47_compilation.patch new file mode 100644 index 000000000..aca2be126 --- /dev/null +++ b/redhat/applications/bibletime/bibletime-3.5.13-fix_gcc47_compilation.patch @@ -0,0 +1,13 @@ +--- bibletime/bibletime/frontend/cinfodisplay.cpp.ORI 2012-05-01 14:13:38.750903801 +0200 ++++ bibletime/bibletime/frontend/cinfodisplay.cpp 2012-05-01 14:14:59.998011927 +0200 +@@ -229,8 +229,8 @@ + VerseKey vk; + sword::ListKey refs = vk.ParseVerseList((const char*)data.mid((pos == -1) ? 0 : pos+1).utf8(), "Gen 1:1", true); + +- for (int i = 0; i < refs.Count(); ++i) { +- SWKey* key = refs.getElement(i); ++ for (int j = 0; j < refs.Count(); ++j) { ++ SWKey* key = refs.getElement(j); + Q_ASSERT(key); + VerseKey* vk = dynamic_cast<VerseKey*>(key); + diff --git a/redhat/applications/bibletime/trinity-bibletime.spec b/redhat/applications/bibletime/trinity-bibletime.spec index 0c6e8b0d8..0ab483844 100644 --- a/redhat/applications/bibletime/trinity-bibletime.spec +++ b/redhat/applications/bibletime/trinity-bibletime.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp bibletime %define version 1.6.6.0 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -35,6 +35,8 @@ Source0: %{kdecomp}-3.5.13.tar.gz # Fix detection of older versions of clucene in Fedora >= 16 Patch0: bibletime-3.5.13-clucene_detection.patch +# [bibletime] Fix compilation with GCC 4.7 +Patch1: bibletime-3.5.13-fix_gcc47_compilation.patch BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel @@ -62,15 +64,16 @@ texts, write own notes, save, print etc.). %prep %setup -q -n applications/%{kdecomp} %patch0 -p0 +%patch1 -p1 # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -127,5 +130,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-2 +- Fix compilation on RHEL 5 +- Fix compilation with GCC 4.7 + * Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/digikam/digikam-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/digikam/digikam-3.5.13-fix_gcc47_compilation.patch new file mode 100644 index 000000000..c1f0e1d6c --- /dev/null +++ b/redhat/applications/digikam/digikam-3.5.13-fix_gcc47_compilation.patch @@ -0,0 +1,24 @@ +--- digikam/digikam/libs/dimg/loaders/pngloader.cpp.libpng 2012-05-01 15:02:57.235666444 +0200 ++++ digikam/digikam/libs/dimg/loaders/pngloader.cpp 2012-05-01 15:04:30.737122439 +0200 +@@ -408,10 +408,11 @@ + TQMap<int, TQByteArray>& metaData = imageMetaData(); + + png_charp profile_name, profile_data=NULL; ++ unsigned char* uprofile_data = reinterpret_cast<unsigned char*>(profile_data); + png_uint_32 profile_size; + int compression_type; + +- png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &profile_data, &profile_size); ++ png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &uprofile_data, &profile_size); + + if (profile_data != NULL) + { +@@ -607,7 +608,7 @@ + + if (!profile_rawdata.isEmpty()) + { +- png_set_iCCP(png_ptr, info_ptr, (png_charp)"icc", PNG_COMPRESSION_TYPE_BASE, profile_rawdata.data(), profile_rawdata.size()); ++ png_set_iCCP(png_ptr, info_ptr, (png_charp)"icc", PNG_COMPRESSION_TYPE_BASE, (unsigned char*)profile_rawdata.data(), profile_rawdata.size()); + } + + // ------------------------------------------------------------------- diff --git a/redhat/applications/digikam/digikam-3.5.13-fix_libpng_1.4.patch b/redhat/applications/digikam/digikam-3.5.13-fix_libpng_1.4.patch new file mode 100644 index 000000000..a07b5ba6f --- /dev/null +++ b/redhat/applications/digikam/digikam-3.5.13-fix_libpng_1.4.patch @@ -0,0 +1,54 @@ +diff -ruN digikam-0.9.6.old/digikam/kioslave/digikamthumbnail.cpp digikam-0.9.6/digikam/kioslave/digikamthumbnail.cpp +--- digikam-0.9.6.old/digikam/kioslave/digikamthumbnail.cpp 2009-07-03 07:19:41.000000000 +0200 ++++ digikam-0.9.6/digikam/kioslave/digikamthumbnail.cpp 2010-06-30 10:29:09.000000000 +0200 +@@ -370,7 +370,7 @@ + unsigned char buf[PNG_BYTES_TO_CHECK]; + + fread(buf, 1, PNG_BYTES_TO_CHECK, f); +- if (!png_check_sig(buf, PNG_BYTES_TO_CHECK)) ++ if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK)) + { + fclose(f); + return qimage; +@@ -465,7 +465,7 @@ + { + png_set_gray_to_rgb(png_ptr); + if (png_get_bit_depth(png_ptr, info_ptr) < 8) +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + } + + int sizeOfUint = sizeof(unsigned int); +diff -ruN digikam-0.9.6.old/digikam/libs/dimg/loaders/pngloader.cpp digikam-0.9.6/digikam/libs/dimg/loaders/pngloader.cpp +--- digikam-0.9.6.old/digikam/libs/dimg/loaders/pngloader.cpp 2009-07-03 07:19:41.000000000 +0200 ++++ digikam-0.9.6/digikam/libs/dimg/loaders/pngloader.cpp 2010-06-30 10:28:24.000000000 +0200 +@@ -88,7 +88,7 @@ + unsigned char buf[PNG_BYTES_TO_CHECK]; + + fread(buf, 1, PNG_BYTES_TO_CHECK, f); +- if (!png_check_sig(buf, PNG_BYTES_TO_CHECK)) ++ if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK)) + { + DDebug() << k_funcinfo << "Not a PNG image file." << endl; + fclose(f); +@@ -252,7 +252,7 @@ + #ifdef ENABLE_DEBUG_MESSAGES + DDebug() << "PNG in PNG_COLOR_TYPE_GRAY" << endl; + #endif +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + png_set_gray_to_rgb(png_ptr); + + if (TQImage::systemByteOrder() == TQImage::LittleEndian) // Intel +diff -ruN digikam-0.9.6.old/digikam/libs/greycstoration/CImg.h digikam-0.9.6/digikam/libs/greycstoration/CImg.h +--- digikam-0.9.6.old/digikam/libs/greycstoration/CImg.h 2009-07-03 07:19:41.000000000 +0200 ++++ digikam-0.9.6/digikam/libs/greycstoration/CImg.h 2010-06-30 10:28:52.000000000 +0200 +@@ -29449,7 +29449,7 @@ + new_bit_depth = 8; + } + if (new_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8){ +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + new_bit_depth = 8; + } + if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) diff --git a/redhat/applications/digikam/digikam-3.5.13-fix_libpng_support.patch b/redhat/applications/digikam/digikam-3.5.13-fix_libpng_support.patch new file mode 100644 index 000000000..5ca2353ef --- /dev/null +++ b/redhat/applications/digikam/digikam-3.5.13-fix_libpng_support.patch @@ -0,0 +1,40 @@ +--- digikam/digikam/libs/dimg/loaders/pngloader.cpp.ORI 2012-05-01 14:49:41.357985513 +0200 ++++ digikam/digikam/libs/dimg/loaders/pngloader.cpp 2012-05-01 14:53:47.459349483 +0200 +@@ -120,7 +120,11 @@ + // PNG error handling. If an error occurs during reading, libpng + // will jump here + ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if (setjmp(png_jmpbuf(png_ptr))) ++#else + if (setjmp(png_ptr->jmpbuf)) ++#endif + { + DDebug() << k_funcinfo << "Internal libPNG error during reading file. Process aborted!" << endl; + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); +@@ -526,7 +531,11 @@ + // PNG error handling. If an error occurs during writing, libpng + // will jump here + ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if (setjmp(png_jmpbuf(png_ptr))) ++#else + if (setjmp(png_ptr->jmpbuf)) ++#endif + { + DDebug() << k_funcinfo << "Internal libPNG error during writing file. Process aborted!" << endl; + fclose(f); +--- digikam/digikam/kioslave/digikamthumbnail.cpp.ORI 2012-05-01 15:44:40.237089691 +0200 ++++ digikam/digikam/kioslave/digikamthumbnail.cpp 2012-05-01 15:45:22.939534916 +0200 +@@ -392,7 +392,11 @@ + return qimage; + } + ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if (setjmp(png_jmpbuf(png_ptr))) ++#else + if (setjmp(png_ptr->jmpbuf)) ++#endif + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + fclose(f); diff --git a/redhat/applications/digikam/digikam-3.5.13-libpng15+gcc47_1.patch b/redhat/applications/digikam/digikam-3.5.13-libpng15+gcc47_1.patch new file mode 100644 index 000000000..ccc51a80e --- /dev/null +++ b/redhat/applications/digikam/digikam-3.5.13-libpng15+gcc47_1.patch @@ -0,0 +1,47 @@ +diff -uNrb digikam.orig/digikam/digikam/albummanager.cpp digikam/digikam/digikam/albummanager.cpp +--- digikam.orig/digikam/digikam/albummanager.cpp 2012-02-21 18:52:03.000000000 -0600 ++++ digikam/digikam/digikam/albummanager.cpp 2012-04-19 16:42:29.951033101 -0500 +@@ -1579,16 +1579,16 @@ + + // Check if Year Album already exist. + DAlbum *yAlbum = 0; +- AlbumIterator it(d->rootDAlbum); +- while (it.current()) ++ AlbumIterator it2(d->rootDAlbum); ++ while (it2.current()) + { +- DAlbum* a = (DAlbum*)(*it); ++ DAlbum* a = (DAlbum*)(*it2); + if (a->date() == TQDate(year, 1, 1) && a->range() == DAlbum::Year) + { + yAlbum = a; + break; + } +- ++it; ++ ++it2; + } + + // If no, create Year album. +diff -uNrb digikam.orig/digikam/kioslave/digikamthumbnail.cpp digikam/digikam/kioslave/digikamthumbnail.cpp +--- digikam.orig/digikam/kioslave/digikamthumbnail.cpp 2012-04-19 07:02:43.000000000 -0500 ++++ digikam/digikam/kioslave/digikamthumbnail.cpp 2012-04-19 16:44:10.307517462 -0500 +@@ -413,16 +413,16 @@ + if (color_type == PNG_COLOR_TYPE_PALETTE) + png_set_expand(png_ptr); + +- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) ++ if (color_type == PNG_COLOR_TYPE_RGB_ALPHA) + has_alpha = 1; + +- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) ++ if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA) + { + has_alpha = 1; + has_grey = 1; + } + +- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY) ++ if (color_type == PNG_COLOR_TYPE_GRAY) + has_grey = 1; + + unsigned char **lines; diff --git a/redhat/applications/digikam/trinity-digikam-3.5.13.spec b/redhat/applications/digikam/trinity-digikam-3.5.13.spec index 6baafc83e..60a2421d5 100644 --- a/redhat/applications/digikam/trinity-digikam-3.5.13.spec +++ b/redhat/applications/digikam/trinity-digikam-3.5.13.spec @@ -34,8 +34,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz # TDE 3.5.13 on RHEL/Fedora specific patches -Patch0: digikam-3.5.13-jpegint-ftbfs.patch - +Patch1: digikam-3.5.13-jpegint-ftbfs.patch +# [digikam] Add support for libpng 1.4 [Bug #595] +Patch2: digikam-3.5.13-fix_libpng_1.4.patch +# [digikam] gcc 4.7 + libpng 1.5 patch for digikam (consolidated) [Bug #958] +Patch3: digikam-3.5.13-libpng15+gcc47_1.patch +# [digikam] Fix libpng support (again !!!) +Patch4: digikam-3.5.13-fix_libpng_support.patch +# [digikam] Fix compilation with GCC 4.7 +Patch5: digikam-3.5.13-fix_gcc47_compilation.patch BuildRequires: tqtinterface-devel BuildRequires: trinity-arts-devel @@ -46,7 +53,11 @@ BuildRequires: gettext BuildRequires: trinity-libkexiv2-devel BuildRequires: trinity-libkdcraw-devel BuildRequires: trinity-libkipi-devel +%if 0%{?rhel} == 5 +BuildRequires: gphoto2-devel +%else BuildRequires: libgphoto2-devel +%endif BuildRequires: libtiff-devel BuildRequires: jasper-devel @@ -83,15 +94,22 @@ Requires: %{name} = %{version} %prep %setup -q -n applications/%{kdecomp} -%patch0 -p5 +%patch1 -p5 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 -b .libpng +%if 0%{?fedora} >= 17 +%patch5 -p1 -b .gcc47 +%endif # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -139,8 +157,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_datadir}/services/*.protocol %{_datadir}/servicetypes/digikamimageplugin.desktop %{_datadir}/apps/*/ -%{_docdir}/HTML/en/*/ -%{_datadir}/icons/*/*/*/* +%{tde_docdir}/HTML/en/*/ +%{_datadir}/icons/hicolor/*/*/* %{_mandir}/man*/* @@ -154,6 +172,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog -* Sun Nov 06 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.6-0 +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-2 +- gcc 4.7 + libpng 1.5 patch for digikam (consolidated) [Bug #958] + +* Sun Nov 06 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.6-1 - Initial release for RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/dolphin/trinity-dolphin-3.5.13.spec b/redhat/applications/dolphin/trinity-dolphin-3.5.13.spec index 1b488e70e..7e2c359a1 100644 --- a/redhat/applications/dolphin/trinity-dolphin-3.5.13.spec +++ b/redhat/applications/dolphin/trinity-dolphin-3.5.13.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp dolphin %define version 0.9.2 -%define release 3 +%define release 4 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -17,7 +17,7 @@ BuildRequires: autoconf automake libtool m4 Name: trinity-%{kdecomp} -Summary: File manager for KDE focusing on usability +Summary: File manager for TDE focusing on usability Version: %{?version} Release: %{?release}%{?dist}%{?_variant} @@ -51,11 +51,12 @@ interface for the task of file management. # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -123,13 +124,17 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_bindir}/* %{_datadir}/applications/*.desktop %{_datadir}/apps/*/ -%doc %lang(en) %{_docdir}/HTML/en/*/ +%doc %lang(en) %{tde_docdir}/HTML/en/*/ %{_datadir}/icons/hicolor/128x128/apps/*.png %{_datadir}/icons/hicolor/??x??/apps/*.png %{_datadir}/locale/*/*/d3lphin.mo %Changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.2-4 +- Rebuild for Fedora 17 +- Fix HTML installation directory + * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-3 - Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/filelight-l10n/trinity-filelight-l10n.spec b/redhat/applications/filelight-l10n/trinity-filelight-l10n.spec index 835fa143c..81670381d 100644 --- a/redhat/applications/filelight-l10n/trinity-filelight-l10n.spec +++ b/redhat/applications/filelight-l10n/trinity-filelight-l10n.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp filelight-l10n %define version 1.0 -%define release 1 +%define release 2 %define debug_package %{nil} @@ -62,11 +62,11 @@ See the 'filelight' package description for more information. # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -91,13 +91,6 @@ export PATH="%{_bindir}:${PATH}" %__rm -rf %{buildroot} -%post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - -%postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %files @@ -107,5 +100,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2 +- Rebuilt for Fedora 17 +- Removes useless post and postun + * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/filelight/trinity-filelight-3.5.13.spec b/redhat/applications/filelight/trinity-filelight-3.5.13.spec index 43878bf0a..7dac5417d 100644 --- a/redhat/applications/filelight/trinity-filelight-3.5.13.spec +++ b/redhat/applications/filelight/trinity-filelight-3.5.13.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp filelight %define version 1.0 -%define release 3 +%define release 4 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -49,15 +49,17 @@ directories on your computer. # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" %build +unset QTDIR || : ; source /etc/profile.d/qt.sh export PATH="%{_bindir}:${PATH}" export LDFLAGS="-L%{_libdir} -I%{_includedir}" @@ -79,12 +81,16 @@ export PATH="%{_bindir}:${PATH}" %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done %files @@ -93,16 +99,23 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_bindir}/* %{_datadir}/applications/*/*.desktop %{_datadir}/apps/*/ -%{_datadir}/icons/*/*/*/* -%{_datadir}/locale/*/*/*.mo +%{_datadir}/icons/crystalsvg/*/*/* +%{_datadir}/icons/hicolor/*/*/* %{_datadir}/config/filelightrc %{_datadir}/services/*.desktop -%{_docdir}/HTML/*/*/ -%{_libdir}/*/*.so -%exclude %{_libdir}/*/*.la +%{tde_libdir}/*.so +%exclude %{tde_libdir}/*.la + +# Translations files are packaged in 'filelight-l10n' +%exclude %{tde_docdir}/HTML/*/*/ +%exclude %{_datadir}/locale/ %Changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-4 +- Rebuilt for Fedora 17 +- Fix HTML directory location + * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-3 - Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13-fix_glib_include.patch b/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13-fix_glib_include.patch new file mode 100644 index 000000000..caf67e13b --- /dev/null +++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13-fix_glib_include.patch @@ -0,0 +1,11 @@ +--- gtk-qt-engine/src/qt_theme_draw.c.ORI 2012-05-01 19:52:05.317334548 +0200 ++++ gtk-qt-engine/src/qt_theme_draw.c 2012-05-01 19:54:50.474099070 +0200 +@@ -3,7 +3,7 @@ + #include <gtk/gtkprogressbar.h> + #include <gdk/gdk.h> + #include <gtk/gtk.h> +-#include <glib/glist.h> ++#include <glib.h> + + #ifdef HAVE_BONOBO + #include <libbonobo.h> diff --git a/redhat/applications/gtk-qt-engine/trinity-gtk-qt-engine.spec b/redhat/applications/gtk-qt-engine/trinity-gtk-qt-engine.spec index ccdbaa156..2d84bc729 100644 --- a/redhat/applications/gtk-qt-engine/trinity-gtk-qt-engine.spec +++ b/redhat/applications/gtk-qt-engine/trinity-gtk-qt-engine.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp gtk-qt-engine %define version 0.8 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -33,6 +33,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz +# [gtk-qt-engine] Fix inclusion of 'glib.h' +Patch1: gtk-qt-engine-3.5.13-fix_glib_include.patch BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel @@ -53,7 +55,7 @@ a way to configure it from within KControl. %prep %setup -q -n applications/%{kdecomp} - +%patch1 -p1 # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! @@ -65,12 +67,9 @@ sed -i CMakeLists.txt \ unset QTDIR || : ; . /etc/profile.d/qt.sh export PATH="%{_bindir}:${PATH}" -export CXXFLAGS="-I${QTINC} ${CXXFLAGS}" - %__mkdir build cd build %cmake \ - -DKDE3PREFIX=%{_prefix} \ .. %__make %{?_smp_mflags} @@ -86,14 +85,6 @@ export PATH="%{_bindir}:${PATH}" %__rm -rf %{buildroot} -%post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - -%postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - %files %defattr(-,root,root,-) @@ -107,5 +98,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-2 +- Rebuilt for Fedora 17 +- Fix FTBFS with newer glib +- Removes useless post and postun + * Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/gwenview/gwenview-3.5.13-fix_alphabet_string_error.patch b/redhat/applications/gwenview/gwenview-3.5.13-fix_alphabet_string_error.patch new file mode 100644 index 000000000..4b9f93e75 --- /dev/null +++ b/redhat/applications/gwenview/gwenview-3.5.13-fix_alphabet_string_error.patch @@ -0,0 +1,19 @@ +commit 9cb99cdb5337032764d897c94a5e7c8803784d4e +Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Date: 1327529624 -0600 + + Fix linear alphabet string errors + +diff --git a/src/gvcore/xpm.cpp b/src/gvcore/xpm.cpp +index a021c55..f9018b8 100644 +--- a/src/gvcore/xpm.cpp ++++ b/src/gvcore/xpm.cpp +@@ -308,7 +308,7 @@ static const char* xpm_color_name( int cpp, int index ) + { + static char returnable[5]; + static const char code[] = ".#abcdefghijklmnopqrstuvwxyzABCD" +- "EFGHIJKLMNOPTQRSTUVWXYZ0123456789"; ++ "EFGHIJKLMNOPQRSTUVWXYZ0123456789"; + // cpp is limited to 4 and index is limited to 64^cpp + if ( cpp > 1 ) { + if ( cpp > 2 ) { diff --git a/redhat/applications/gwenview/gwenview-3.5.13-fix_building_libpng15.patch b/redhat/applications/gwenview/gwenview-3.5.13-fix_building_libpng15.patch new file mode 100644 index 000000000..b8220bd7b --- /dev/null +++ b/redhat/applications/gwenview/gwenview-3.5.13-fix_building_libpng15.patch @@ -0,0 +1,146 @@ +commit 303be4553ad5bbe79d50a8708cf1f8f0e4d220af +Author: Darrell Anderson <humanreadable@yahoo.com> +Date: 1334285908 -0500 + + Fix building with libpng 1.5. + +diff --git a/src/gvcore/pngformattype.cpp b/src/gvcore/pngformattype.cpp +index 77bf7b3..8da8089 100644 +--- a/src/gvcore/pngformattype.cpp ++++ b/src/gvcore/pngformattype.cpp +@@ -211,7 +211,7 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr ) + + if ( color_type == PNG_COLOR_TYPE_GRAY ) { + // Black & White or 8-bit grayscale +- if ( bit_depth == 1 && info_ptr->channels == 1 ) { ++ if ( bit_depth == 1 && png_get_channels(png_ptr, info_ptr) == 1 ) { + png_set_invert_mono( png_ptr ); + png_read_update_info( png_ptr, info_ptr ); + if (!image.create( width, height, 1, 2, TQImage::BigEndian )) +@@ -246,7 +246,11 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr ) + } + if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { + #if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=4 ) +- const int g = info_ptr->trans_color.gray; ++ png_bytep trans_alpha; ++ int num_trans; ++ png_color_16p trans_color; ++ png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color); ++ const int g = trans_color->gray; + #else + const int g = info_ptr->trans_values.gray; + #endif +@@ -256,9 +260,13 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr ) + } + } + } +- } else if ( color_type == PNG_COLOR_TYPE_PALETTE ++ } else { ++ png_colorp palette; ++ int num_palette; ++ png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette); ++ if ( color_type == PNG_COLOR_TYPE_PALETTE + && png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE) +- && info_ptr->num_palette <= 256 ) ++ && num_palette <= 256 ) + { + // 1-bit and 8-bit color + if ( bit_depth != 1 ) +@@ -266,20 +274,28 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr ) + png_read_update_info( png_ptr, info_ptr ); + png_get_IHDR(png_ptr, info_ptr, + &width, &height, &bit_depth, &color_type, 0, 0, 0); +- if (!image.create(width, height, bit_depth, info_ptr->num_palette, ++ if (!image.create(width, height, bit_depth, num_palette, + TQImage::BigEndian)) + return; + int i = 0; + if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { ++ png_bytep trans_alpha; ++ int num_trans; ++ png_color_16p trans_color; ++ png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color); + image.setAlphaBuffer( TRUE ); +- while ( i < info_ptr->num_trans ) { ++ while ( i < num_trans ) { + image.setColor(i, tqRgba( +- info_ptr->palette[i].red, +- info_ptr->palette[i].green, +- info_ptr->palette[i].blue, +-#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=4 ) +- info_ptr->trans_alpha[i] +-#else ++ palette[i].red, ++ palette[i].green, ++ palette[i].blue, ++#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 ) ++ trans_alpha[i] ++#endif ++#if ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR==4 ) ++ info_ptr->trans_alpha[i] ++#endif ++#if ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR<=3 ) + info_ptr->trans[i] + #endif + ) +@@ -287,11 +303,11 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr ) + i++; + } + } +- while ( i < info_ptr->num_palette ) { ++ while ( i < num_palette ) { + image.setColor(i, tqRgba( +- info_ptr->palette[i].red, +- info_ptr->palette[i].green, +- info_ptr->palette[i].blue, ++ palette[i].red, ++ palette[i].green, ++ palette[i].blue, + 0xff + ) + ); +@@ -326,12 +342,13 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr ) + } + + png_read_update_info(png_ptr, info_ptr); +- } ++ } + + // TQt==ARGB==Big(ARGB)==Little(BGRA) + if ( TQImage::systemByteOrder() == TQImage::LittleEndian ) { + png_set_bgr(png_ptr); + } ++ } + } + + +@@ -389,7 +406,7 @@ int PNGFormat::decode(TQImage& img, TQImageConsumer* cons, + return -1; + } + +- if (setjmp((png_ptr)->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_read_struct(&png_ptr, &info_ptr, 0); + image = 0; + return -1; +@@ -417,7 +434,7 @@ int PNGFormat::decode(TQImage& img, TQImageConsumer* cons, + + if ( !png_ptr ) return 0; + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_read_struct(&png_ptr, &info_ptr, 0); + image = 0; + state = MovieStart; +@@ -484,7 +501,11 @@ void PNGFormat::end(png_structp png, png_infop info) + consumer->frameDone(TQPoint(offx,offy),r); + consumer->end(); + state = FrameStart; ++#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 ) ++ unused_data = png_process_data_pause(png, 1); ++#else + unused_data = (int)png->buffer_size; // Since libpng doesn't tell us ++#endif + } + + #ifdef PNG_USER_CHUNKS_SUPPORTED diff --git a/redhat/applications/gwenview/gwenview-3.5.13-fix_ftbfs.patch b/redhat/applications/gwenview/gwenview-3.5.13-fix_ftbfs.patch new file mode 100644 index 000000000..ade498fed --- /dev/null +++ b/redhat/applications/gwenview/gwenview-3.5.13-fix_ftbfs.patch @@ -0,0 +1,19 @@ +commit 1ca2f7392842e9ffd76fbc5aefc51213eb9ce262 +Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Date: 1325190949 -0600 + + Fix FTBFS + +diff --git a/src/gvcore/imageviewconfig.kcfg b/src/gvcore/imageviewconfig.kcfg +index d93051a..e5c1e04 100644 +--- a/src/gvcore/imageviewconfig.kcfg ++++ b/src/gvcore/imageviewconfig.kcfg +@@ -2,7 +2,7 @@ + <!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd"> + <kcfg> + <include>tqapplication.h</include> +- <include>palette.h</include> ++ <include>tqpalette.h</include> + <kcfgfile name="gwenviewrc"/> + <group name="pixmap widget"> + <entry name="smoothAlgorithm" key="smooth scale" type="Enum"> diff --git a/redhat/applications/gwenview/gwenview-3.5.13-fix_ftbfs_in_jpeg_code.patch b/redhat/applications/gwenview/gwenview-3.5.13-fix_ftbfs_in_jpeg_code.patch new file mode 100644 index 000000000..b2935457f --- /dev/null +++ b/redhat/applications/gwenview/gwenview-3.5.13-fix_ftbfs_in_jpeg_code.patch @@ -0,0 +1,261 @@ +commit ace6f27083b0acc2f30195f0d8908a9a346a5910 +Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Date: 1326325099 -0600 + + Fix FTBFS in jpeg code + +diff --git a/src/imageutils/jpegint.h b/src/imageutils/jpegint.h +index 9d00c59..95b00d4 100644 +--- a/src/imageutils/jpegint.h ++++ b/src/imageutils/jpegint.h +@@ -43,9 +43,9 @@ typedef enum { /* Operating modes for buffer controllers */ + + /* Master control module */ + struct jpeg_comp_master { +- JTQT_METHOD(void, prepare_for_pass, (j_compress_ptr cinfo)); +- JTQT_METHOD(void, pass_startup, (j_compress_ptr cinfo)); +- JTQT_METHOD(void, finish_pass, (j_compress_ptr cinfo)); ++ JMETHOD(void, prepare_for_pass, (j_compress_ptr cinfo)); ++ JMETHOD(void, pass_startup, (j_compress_ptr cinfo)); ++ JMETHOD(void, finish_pass, (j_compress_ptr cinfo)); + + /* State variables made visible to other modules */ + boolean call_pass_startup; /* True if pass_startup must be called */ +@@ -54,16 +54,16 @@ struct jpeg_comp_master { + + /* Main buffer control (downsampled-data buffer) */ + struct jpeg_c_main_controller { +- JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode)); +- JTQT_METHOD(void, process_data, (j_compress_ptr cinfo, ++ JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode)); ++ JMETHOD(void, process_data, (j_compress_ptr cinfo, + JSAMPARRAY input_buf, JDIMENSION *in_row_ctr, + JDIMENSION in_rows_avail)); + }; + + /* Compression preprocessing (downsampling input buffer control) */ + struct jpeg_c_prep_controller { +- JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode)); +- JTQT_METHOD(void, pre_process_data, (j_compress_ptr cinfo, ++ JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode)); ++ JMETHOD(void, pre_process_data, (j_compress_ptr cinfo, + JSAMPARRAY input_buf, + JDIMENSION *in_row_ctr, + JDIMENSION in_rows_avail, +@@ -74,23 +74,23 @@ struct jpeg_c_prep_controller { + + /* Coefficient buffer control */ + struct jpeg_c_coef_controller { +- JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode)); +- JTQT_METHOD(boolean, compress_data, (j_compress_ptr cinfo, ++ JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode)); ++ JMETHOD(boolean, compress_data, (j_compress_ptr cinfo, + JSAMPIMAGE input_buf)); + }; + + /* Colorspace conversion */ + struct jpeg_color_converter { +- JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo)); +- JTQT_METHOD(void, color_convert, (j_compress_ptr cinfo, ++ JMETHOD(void, start_pass, (j_compress_ptr cinfo)); ++ JMETHOD(void, color_convert, (j_compress_ptr cinfo, + JSAMPARRAY input_buf, JSAMPIMAGE output_buf, + JDIMENSION output_row, int num_rows)); + }; + + /* Downsampling */ + struct jpeg_downsampler { +- JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo)); +- JTQT_METHOD(void, downsample, (j_compress_ptr cinfo, ++ JMETHOD(void, start_pass, (j_compress_ptr cinfo)); ++ JMETHOD(void, downsample, (j_compress_ptr cinfo, + JSAMPIMAGE input_buf, JDIMENSION in_row_index, + JSAMPIMAGE output_buf, + JDIMENSION out_row_group_index)); +@@ -100,9 +100,9 @@ struct jpeg_downsampler { + + /* Forward DCT (also controls coefficient quantization) */ + struct jpeg_forward_dct { +- JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo)); ++ JMETHOD(void, start_pass, (j_compress_ptr cinfo)); + /* perhaps this should be an array??? */ +- JTQT_METHOD(void, forward_DCT, (j_compress_ptr cinfo, ++ JMETHOD(void, forward_DCT, (j_compress_ptr cinfo, + jpeg_component_info * compptr, + JSAMPARRAY sample_data, JBLOCKROW coef_blocks, + JDIMENSION start_row, JDIMENSION start_col, +@@ -111,23 +111,23 @@ struct jpeg_forward_dct { + + /* Entropy encoding */ + struct jpeg_entropy_encoder { +- JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics)); +- JTQT_METHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data)); +- JTQT_METHOD(void, finish_pass, (j_compress_ptr cinfo)); ++ JMETHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics)); ++ JMETHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data)); ++ JMETHOD(void, finish_pass, (j_compress_ptr cinfo)); + }; + + /* Marker writing */ + struct jpeg_marker_writer { +- JTQT_METHOD(void, write_file_header, (j_compress_ptr cinfo)); +- JTQT_METHOD(void, write_frame_header, (j_compress_ptr cinfo)); +- JTQT_METHOD(void, write_scan_header, (j_compress_ptr cinfo)); +- JTQT_METHOD(void, write_file_trailer, (j_compress_ptr cinfo)); +- JTQT_METHOD(void, write_tables_only, (j_compress_ptr cinfo)); ++ JMETHOD(void, write_file_header, (j_compress_ptr cinfo)); ++ JMETHOD(void, write_frame_header, (j_compress_ptr cinfo)); ++ JMETHOD(void, write_scan_header, (j_compress_ptr cinfo)); ++ JMETHOD(void, write_file_trailer, (j_compress_ptr cinfo)); ++ JMETHOD(void, write_tables_only, (j_compress_ptr cinfo)); + /* These routines are exported to allow insertion of extra markers */ + /* Probably only COM and APPn markers should be written this way */ +- JTQT_METHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker, ++ JMETHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker, + unsigned int datalen)); +- JTQT_METHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val)); ++ JMETHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val)); + }; + + +@@ -135,8 +135,8 @@ struct jpeg_marker_writer { + + /* Master control module */ + struct jpeg_decomp_master { +- JTQT_METHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo)); +- JTQT_METHOD(void, finish_output_pass, (j_decompress_ptr cinfo)); ++ JMETHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo)); ++ JMETHOD(void, finish_output_pass, (j_decompress_ptr cinfo)); + + /* State variables made visible to other modules */ + boolean is_dummy_pass; /* True during 1st pass for 2-pass quant */ +@@ -144,10 +144,10 @@ struct jpeg_decomp_master { + + /* Input control module */ + struct jpeg_input_controller { +- JTQT_METHOD(int, consume_input, (j_decompress_ptr cinfo)); +- JTQT_METHOD(void, reset_input_controller, (j_decompress_ptr cinfo)); +- JTQT_METHOD(void, start_input_pass, (j_decompress_ptr cinfo)); +- JTQT_METHOD(void, finish_input_pass, (j_decompress_ptr cinfo)); ++ JMETHOD(int, consume_input, (j_decompress_ptr cinfo)); ++ JMETHOD(void, reset_input_controller, (j_decompress_ptr cinfo)); ++ JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo)); ++ JMETHOD(void, finish_input_pass, (j_decompress_ptr cinfo)); + + /* State variables made visible to other modules */ + boolean has_multiple_scans; /* True if file has multiple scans */ +@@ -156,18 +156,18 @@ struct jpeg_input_controller { + + /* Main buffer control (downsampled-data buffer) */ + struct jpeg_d_main_controller { +- JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode)); +- JTQT_METHOD(void, process_data, (j_decompress_ptr cinfo, ++ JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode)); ++ JMETHOD(void, process_data, (j_decompress_ptr cinfo, + JSAMPARRAY output_buf, JDIMENSION *out_row_ctr, + JDIMENSION out_rows_avail)); + }; + + /* Coefficient buffer control */ + struct jpeg_d_coef_controller { +- JTQT_METHOD(void, start_input_pass, (j_decompress_ptr cinfo)); +- JTQT_METHOD(int, consume_data, (j_decompress_ptr cinfo)); +- JTQT_METHOD(void, start_output_pass, (j_decompress_ptr cinfo)); +- JTQT_METHOD(int, decompress_data, (j_decompress_ptr cinfo, ++ JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo)); ++ JMETHOD(int, consume_data, (j_decompress_ptr cinfo)); ++ JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo)); ++ JMETHOD(int, decompress_data, (j_decompress_ptr cinfo, + JSAMPIMAGE output_buf)); + /* Pointer to array of coefficient virtual arrays, or NULL if none */ + jvirt_barray_ptr *coef_arrays; +@@ -175,8 +175,8 @@ struct jpeg_d_coef_controller { + + /* Decompression postprocessing (color quantization buffer control) */ + struct jpeg_d_post_controller { +- JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode)); +- JTQT_METHOD(void, post_process_data, (j_decompress_ptr cinfo, ++ JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode)); ++ JMETHOD(void, post_process_data, (j_decompress_ptr cinfo, + JSAMPIMAGE input_buf, + JDIMENSION *in_row_group_ctr, + JDIMENSION in_row_groups_avail, +@@ -187,12 +187,12 @@ struct jpeg_d_post_controller { + + /* Marker reading & parsing */ + struct jpeg_marker_reader { +- JTQT_METHOD(void, reset_marker_reader, (j_decompress_ptr cinfo)); ++ JMETHOD(void, reset_marker_reader, (j_decompress_ptr cinfo)); + /* Read markers until SOS or EOI. + * Returns same codes as are defined for jpeg_consume_input: + * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI. + */ +- JTQT_METHOD(int, read_markers, (j_decompress_ptr cinfo)); ++ JMETHOD(int, read_markers, (j_decompress_ptr cinfo)); + /* Read a restart marker --- exported for use by entropy decoder only */ + jpeg_marker_parser_method read_restart_marker; + +@@ -207,8 +207,8 @@ struct jpeg_marker_reader { + + /* Entropy decoding */ + struct jpeg_entropy_decoder { +- JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo)); +- JTQT_METHOD(boolean, decode_mcu, (j_decompress_ptr cinfo, ++ JMETHOD(void, start_pass, (j_decompress_ptr cinfo)); ++ JMETHOD(boolean, decode_mcu, (j_decompress_ptr cinfo, + JBLOCKROW *MCU_data)); + + /* This is here to share code between baseline and progressive decoders; */ +@@ -217,21 +217,21 @@ struct jpeg_entropy_decoder { + }; + + /* Inverse DCT (also performs dequantization) */ +-typedef JTQT_METHOD(void, inverse_DCT_method_ptr, ++typedef JMETHOD(void, inverse_DCT_method_ptr, + (j_decompress_ptr cinfo, jpeg_component_info * compptr, + JCOEFPTR coef_block, + JSAMPARRAY output_buf, JDIMENSION output_col)); + + struct jpeg_inverse_dct { +- JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo)); ++ JMETHOD(void, start_pass, (j_decompress_ptr cinfo)); + /* It is useful to allow each component to have a separate IDCT method. */ + inverse_DCT_method_ptr inverse_DCT[MAX_COMPONENTS]; + }; + + /* Upsampling (note that upsampler must also call color converter) */ + struct jpeg_upsampler { +- JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo)); +- JTQT_METHOD(void, upsample, (j_decompress_ptr cinfo, ++ JMETHOD(void, start_pass, (j_decompress_ptr cinfo)); ++ JMETHOD(void, upsample, (j_decompress_ptr cinfo, + JSAMPIMAGE input_buf, + JDIMENSION *in_row_group_ctr, + JDIMENSION in_row_groups_avail, +@@ -244,20 +244,20 @@ struct jpeg_upsampler { + + /* Colorspace conversion */ + struct jpeg_color_deconverter { +- JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo)); +- JTQT_METHOD(void, color_convert, (j_decompress_ptr cinfo, ++ JMETHOD(void, start_pass, (j_decompress_ptr cinfo)); ++ JMETHOD(void, color_convert, (j_decompress_ptr cinfo, + JSAMPIMAGE input_buf, JDIMENSION input_row, + JSAMPARRAY output_buf, int num_rows)); + }; + + /* Color quantization or color precision reduction */ + struct jpeg_color_quantizer { +- JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan)); +- JTQT_METHOD(void, color_quantize, (j_decompress_ptr cinfo, ++ JMETHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan)); ++ JMETHOD(void, color_quantize, (j_decompress_ptr cinfo, + JSAMPARRAY input_buf, JSAMPARRAY output_buf, + int num_rows)); +- JTQT_METHOD(void, finish_pass, (j_decompress_ptr cinfo)); +- JTQT_METHOD(void, new_color_map, (j_decompress_ptr cinfo)); ++ JMETHOD(void, finish_pass, (j_decompress_ptr cinfo)); ++ JMETHOD(void, new_color_map, (j_decompress_ptr cinfo)); + }; + + diff --git a/redhat/applications/gwenview/gwenview-3.5.13-fix_various_problems.patch b/redhat/applications/gwenview/gwenview-3.5.13-fix_various_problems.patch new file mode 100644 index 000000000..4a0dbfc53 --- /dev/null +++ b/redhat/applications/gwenview/gwenview-3.5.13-fix_various_problems.patch @@ -0,0 +1,114 @@ +commit 1eac443e690763dd571aec664aba52f6683f9916 +Author: Darrell Anderson <humanreadable@yahoo.com> +Date: 1334285947 -0500 + + Fix inadvertent tqt changes. Part of an extensive cleanup of various problems + with kipi-plugins, digikam, and gwenview to resolve bug reports 241, 962, 963. + +diff --git a/src/gvcore/fileviewcontroller.cpp b/src/gvcore/fileviewcontroller.cpp +index 86a0282..a8d0bee 100644 +--- a/src/gvcore/fileviewcontroller.cpp ++++ b/src/gvcore/fileviewcontroller.cpp +@@ -309,7 +309,7 @@ FileViewController::FileViewController(TQWidget* parent,KActionCollection* actio + mBottomThumbnailMode->setExclusiveGroup("thumbnails"); + + // Size slider +- mSizeSlider=new TQSlider(Qt::Horizontal, d->mToolBar); ++ mSizeSlider=new TQSlider(Horizontal, d->mToolBar); + mSizeSlider->setFixedWidth(120); + mSizeSlider->setRange( + ThumbnailSize::MIN/SLIDER_RESOLUTION, +diff --git a/src/gvcore/imageviewtools.cpp b/src/gvcore/imageviewtools.cpp +index da9044a..a749ff3 100644 +--- a/src/gvcore/imageviewtools.cpp ++++ b/src/gvcore/imageviewtools.cpp +@@ -177,7 +177,7 @@ void ImageView::ScrollTool::wheelEvent(TQWheelEvent* event) { + if (ImageViewConfig::mouseWheelScroll()) { + int deltaX, deltaY; + +- if (event->state() & AltButton || event->orientation()==Qt::Horizontal) { ++ if (event->state() & AltButton || event->orientation()==Horizontal) { + deltaX = event->delta(); + deltaY = 0; + } else { +diff --git a/src/imageutils/transupp.c b/src/imageutils/transupp.c +index 3bc6f20..e5ec564 100644 +--- a/src/imageutils/transupp.c ++++ b/src/imageutils/transupp.c +@@ -30,7 +30,7 @@ + * or recompression of the image. + * Thanks to Guido Vollbeding for the initial design and code of this feature. + * +- *Qt::Horizontal flipping is done in-place, using a single top-to-bottom ++ * Horizontal flipping is done in-place, using a single top-to-bottom + * pass through the virtual source array. It will thus be much the + * fastest option for images larger than main memory. + * +@@ -65,7 +65,7 @@ + LOCAL(void) + do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + jvirt_barray_ptr *src_coef_arrays) +-/*Qt::Horizontal flip; done in-place, so no separate dest array is required */ ++/* Horizontal flip; done in-place, so no separate dest array is required */ + { + JDIMENSION MCU_cols, comp_width, blk_x, blk_y; + int ci, k, offset_y; +@@ -74,7 +74,7 @@ do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + JCOEF temp1, temp2; + jpeg_component_info *compptr; + +- /*Qt::Horizontal mirroring of DCT blocks is accomplished by swapping ++ /* Horizontal mirroring of DCT blocks is accomplished by swapping + * pairs of blocks in-place. Within a DCT block, we perform horizontal + * mirroring by changing the signs of odd-numbered columns. + * Partial iMCUs at the right edge are left untouched. +@@ -115,7 +115,7 @@ LOCAL(void) + do_flip_v (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + jvirt_barray_ptr *src_coef_arrays, + jvirt_barray_ptr *dst_coef_arrays) +-/*Qt::Vertical flip */ ++/* Vertical flip */ + { + JDIMENSION MCU_rows, comp_height, dst_blk_x, dst_blk_y; + int ci, i, j, offset_y; +@@ -232,7 +232,7 @@ do_rot_90 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + jvirt_barray_ptr *dst_coef_arrays) + /* 90 degree rotation is equivalent to + * 1. Transposing the image; +- * 2.Qt::Horizontal mirroring. ++ * 2. Horizontal mirroring. + * These two steps are merged into a single processing routine. + */ + { +@@ -295,7 +295,7 @@ do_rot_270 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + jvirt_barray_ptr *src_coef_arrays, + jvirt_barray_ptr *dst_coef_arrays) + /* 270 degree rotation is equivalent to +- * 1.Qt::Horizontal mirroring; ++ * 1. Horizontal mirroring; + * 2. Transposing the image. + * These two steps are merged into a single processing routine. + */ +@@ -359,8 +359,8 @@ do_rot_180 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + jvirt_barray_ptr *src_coef_arrays, + jvirt_barray_ptr *dst_coef_arrays) + /* 180 degree rotation is equivalent to +- * 1.Qt::Vertical mirroring; +- * 2.Qt::Horizontal mirroring. ++ * 1. Vertical mirroring; ++ * 2. Horizontal mirroring. + * These two steps are merged into a single processing routine. + */ + { +@@ -463,9 +463,9 @@ do_transverse (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + * 1. 180 degree rotation; + * 2. Transposition; + * or +- * 1.Qt::Horizontal mirroring; ++ * 1. Horizontal mirroring; + * 2. Transposition; +- * 3.Qt::Horizontal mirroring. ++ * 3. Horizontal mirroring. + * These steps are merged into a single processing routine. + */ + { diff --git a/redhat/applications/gwenview/gwenview-3.5.13-remove_additional_tq_conversions.patch b/redhat/applications/gwenview/gwenview-3.5.13-remove_additional_tq_conversions.patch new file mode 100644 index 000000000..195d89ea6 --- /dev/null +++ b/redhat/applications/gwenview/gwenview-3.5.13-remove_additional_tq_conversions.patch @@ -0,0 +1,915 @@ +commit eba1d381626d92b860239417f21d813f02ee6394 +Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Date: 1324316139 -0600 + + Remove additional unneeded tq method conversions + +diff --git a/src/app/bookmarkviewcontroller.cpp b/src/app/bookmarkviewcontroller.cpp +index 68ee9f0..d09156a 100644 +--- a/src/app/bookmarkviewcontroller.cpp ++++ b/src/app/bookmarkviewcontroller.cpp +@@ -392,11 +392,11 @@ void BookmarkViewController::deleteCurrentBookmark() { + TQString title; + if (bookmark.isGroup()) { + msg=i18n("Are you sure you want to delete the bookmark folder <b>%1</b>?<br>This will delete the folder and all the bookmarks in it.") +- .tqarg(bookmark.text()); ++ .arg(bookmark.text()); + title=i18n("Delete Bookmark &Folder"); + } else { + msg=i18n("Are you sure you want to delete the bookmark <b>%1</b>?") +- .tqarg(bookmark.text()); ++ .arg(bookmark.text()); + title=i18n("Delete &Bookmark"); + } + +diff --git a/src/app/configdialog.cpp b/src/app/configdialog.cpp +index d274188..a429095 100644 +--- a/src/app/configdialog.cpp ++++ b/src/app/configdialog.cpp +@@ -247,7 +247,7 @@ void ConfigDialog::calculateCacheSize() { + KURL url; + url.setPath(ThumbnailLoadJob::thumbnailBaseDir()); + unsigned long size=KDirSize::dirSize(url); +- KMessageBox::information( this,i18n("Cache size is %1").tqarg(KIO::convertSize(size)) ); ++ KMessageBox::information( this,i18n("Cache size is %1").arg(KIO::convertSize(size)) ); + } + + +@@ -281,7 +281,7 @@ void ConfigDialog::emptyCache() { + + int response=KMessageBox::warningContinueCancel(this, + "<qt>" + i18n("Are you sure you want to empty the thumbnail cache?" +- " This will delete the folder <b>%1</b>.").tqarg(TQStyleSheet::escape(dir)) + "</qt>", ++ " This will delete the folder <b>%1</b>.").arg(TQStyleSheet::escape(dir)) + "</qt>", + TQString(), + KStdGuiItem::del()); + +diff --git a/src/app/configimageviewpage.ui b/src/app/configimageviewpage.ui +index 32fb346..2f816c0 100644 +--- a/src/app/configimageviewpage.ui ++++ b/src/app/configimageviewpage.ui +@@ -217,7 +217,7 @@ + <string>Using this option, Gwenview will display the image as fast as possible, and smooth it after a short delay. + Use this option if your computer is not very fast.</string> + </property> +- <property name="tqalignment"> ++ <property name="alignment"> + <set>WordBreak|AlignTop</set> + </property> + <property name="buddy" stdset="0"> +diff --git a/src/app/kipiinterface.cpp b/src/app/kipiinterface.cpp +index 9a35ef3..f95fe54 100644 +--- a/src/app/kipiinterface.cpp ++++ b/src/app/kipiinterface.cpp +@@ -163,7 +163,7 @@ KIPI::ImageCollection KIPIInterface::currentSelection() { + LOG(""); + KURL::List list=d->mFileView->selectedImageURLs(); + KURL url=d->mFileView->dirURL(); +- return KIPI::ImageCollection(new ImageCollection(url, i18n("%1 (Selected Images)").tqarg(url.fileName()), list)); ++ return KIPI::ImageCollection(new ImageCollection(url, i18n("%1 (Selected Images)").arg(url.fileName()), list)); + } + + +@@ -189,12 +189,12 @@ int KIPIInterface::features() const { + * here, it is however necessary to discard caches if the plugin preserves timestamp + */ + bool KIPIInterface::addImage(const KURL& url, TQString&) { +- Cache::instance()->tqinvalidate( url ); ++ Cache::instance()->invalidate( url ); + return true; + } + + void KIPIInterface::delImage(const KURL& url) { +- Cache::instance()->tqinvalidate( url ); ++ Cache::instance()->invalidate( url ); + } + + // TODO currently KDirWatch doesn't have watching of files in a directory +@@ -203,7 +203,7 @@ void KIPIInterface::refreshImages( const KURL::List& urls ) { + for( KURL::List::ConstIterator it = urls.begin(); + it != urls.end(); + ++it ) { +- Cache::instance()->tqinvalidate( *it ); ++ Cache::instance()->invalidate( *it ); + } + d->mFileView->refreshItems( urls ); + } +diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp +index f9acc9b..2f2275b 100644 +--- a/src/app/mainwindow.cpp ++++ b/src/app/mainwindow.cpp +@@ -806,7 +806,7 @@ void MainWindow::updateStatusInfo() { + int pos = mFileViewController->shownFilePosition(); + uint count = mFileViewController->fileCount(); + if (count > 0) { +- tokens << i18n("%1/%2").tqarg(pos+1).tqarg(count); ++ tokens << i18n("%1/%2").arg(pos+1).arg(count); + } else { + tokens << i18n("No images"); + } +@@ -816,7 +816,7 @@ void MainWindow::updateStatusInfo() { + + TQSize size = mDocument->image().size(); + if (!size.isEmpty()) { +- tokens << i18n("%1 x %2 pixels").tqarg(size.width()).tqarg(size.height()); ++ tokens << i18n("%1 x %2 pixels").arg(size.width()).arg(size.height()); + } + + mSBDetailLabel->setText(tokens.join(" - ")); +@@ -1094,9 +1094,9 @@ void MainWindow::createObjectInteractions() { + void MainWindow::createHideShowAction(KDockWidget* dock) { + TQString caption; + if (dock->mayBeHide()) { +- caption=i18n("Hide %1").tqarg(dock->caption()); ++ caption=i18n("Hide %1").arg(dock->caption()); + } else { +- caption=i18n("Show %1").tqarg(dock->caption()); ++ caption=i18n("Show %1").arg(dock->caption()); + } + + KAction* action=new KAction(caption, 0, TQT_TQOBJECT(dock), TQT_SLOT(changeHideShowState()), (TQObject*)0 ); +diff --git a/src/app/metaedit.cpp b/src/app/metaedit.cpp +index 3fa9e19..7aa3ced 100644 +--- a/src/app/metaedit.cpp ++++ b/src/app/metaedit.cpp +@@ -132,7 +132,7 @@ void MetaEdit::setComment(const TQString& comment) { + void MetaEdit::setMessage(const TQString& msg) { + mCommentEdit->setTextFormat(TQTextEdit::RichText); + mCommentEdit->setReadOnly(true); +- mCommentEdit->setText(TQString("<i>%1</i>").tqarg(msg)); ++ mCommentEdit->setText(TQString("<i>%1</i>").arg(msg)); + } + + } // namespace +diff --git a/src/gvcore/cache.cpp b/src/gvcore/cache.cpp +index 448d8f6..8f4bfb3 100644 +--- a/src/gvcore/cache.cpp ++++ b/src/gvcore/cache.cpp +@@ -179,7 +179,7 @@ void Cache::addThumbnail( const KURL& url, const TQPixmap& thumbnail, TQSize ima + checkMaxSize(); + } + +-void Cache::tqinvalidate( const KURL& url ) { ++void Cache::invalidate( const KURL& url ) { + d->mImages.remove( url ); + } + +diff --git a/src/gvcore/cache.h b/src/gvcore/cache.h +index 199bc46..68591a5 100644 +--- a/src/gvcore/cache.h ++++ b/src/gvcore/cache.h +@@ -52,7 +52,7 @@ public: + void getFrames( const KURL& url, ImageFrames* frames, TQCString* format ) const; + TQPixmap thumbnail( const KURL& url, TQSize& imagesize ) const; + void setPriorityURL( const KURL& url, bool set ); +- void tqinvalidate( const KURL& url ); ++ void invalidate( const KURL& url ); + void checkThumbnailSize( int size ); + void readConfig(KConfig*,const TQString& group); + void updateAge(); +diff --git a/src/gvcore/captionformatter.cpp b/src/gvcore/captionformatter.cpp +index 74514f3..4b0a593 100644 +--- a/src/gvcore/captionformatter.cpp ++++ b/src/gvcore/captionformatter.cpp +@@ -35,7 +35,7 @@ TQString CaptionFormatter::format(const TQString& format) { + + TQString resolution; + if (mImageSize.isValid()) { +- resolution = TQString( "%1x%2" ).tqarg( mImageSize.width()).tqarg( mImageSize.height()); ++ resolution = TQString( "%1x%2" ).arg( mImageSize.width()).arg( mImageSize.height()); + } + + TQString str=format; +diff --git a/src/gvcore/clicklineedit.cpp b/src/gvcore/clicklineedit.cpp +index 58c09ac..dfbe3bb 100644 +--- a/src/gvcore/clicklineedit.cpp ++++ b/src/gvcore/clicklineedit.cpp +@@ -40,14 +40,14 @@ ClickLineEdit::ClickLineEdit(TQWidget *parent, const char* name ) : + void ClickLineEdit::setClickMessage( const TQString &msg ) + { + mClickMessage = msg; +- tqrepaint(); ++ repaint(); + } + + + void ClickLineEdit::setText( const TQString &txt ) + { + mDrawClickMsg = txt.isEmpty(); +- tqrepaint(); ++ repaint(); + KLineEdit::setText( txt ); + } + +@@ -86,7 +86,7 @@ void ClickLineEdit::focusInEvent( TQFocusEvent *ev ) + { + if ( mDrawClickMsg == true ) { + mDrawClickMsg = false; +- tqrepaint(); ++ repaint(); + } + TQLineEdit::focusInEvent( ev ); + } +@@ -96,7 +96,7 @@ void ClickLineEdit::focusOutEvent( TQFocusEvent *ev ) + { + if ( text().isEmpty() ) { + mDrawClickMsg = true; +- tqrepaint(); ++ repaint(); + } + TQLineEdit::focusOutEvent( ev ); + } +diff --git a/src/gvcore/deletedialogbase.ui b/src/gvcore/deletedialogbase.ui +index 6abab10..f7d6f90 100644 +--- a/src/gvcore/deletedialogbase.ui ++++ b/src/gvcore/deletedialogbase.ui +@@ -56,7 +56,7 @@ + <property name="text"> + <string>Deletion method placeholder, not in GUI</string> + </property> +- <property name="tqalignment"> ++ <property name="alignment"> + <set>WordBreak|AlignCenter</set> + </property> + </widget> +@@ -80,7 +80,7 @@ + <property name="text"> + <string>Placeholder for number of files, not in GUI</string> + </property> +- <property name="tqalignment"> ++ <property name="alignment"> + <set>AlignVCenter|AlignRight</set> + </property> + </widget> +diff --git a/src/gvcore/document.cpp b/src/gvcore/document.cpp +index caa93f5..b81a229 100644 +--- a/src/gvcore/document.cpp ++++ b/src/gvcore/document.cpp +@@ -343,7 +343,7 @@ void Document::slotLoaded() { + // + //--------------------------------------------------------------------- + void Document::reload() { +- Cache::instance()->tqinvalidate( url()); ++ Cache::instance()->invalidate( url()); + load(); + emit reloaded(url()); + } +@@ -378,7 +378,7 @@ void Document::doPaint(KPrinter *printer, TQPainter *painter) { + TQString t = "true"; + TQString f = "false"; + +- int tqalignment = (printer->option("app-gwenview-position").isEmpty() ? ++ int alignment = (printer->option("app-gwenview-position").isEmpty() ? + TQt::AlignCenter : printer->option("app-gwenview-position").toInt()); + + // Compute filename offset +@@ -407,7 +407,7 @@ void Document::doPaint(KPrinter *printer, TQPainter *painter) { + if (scaling==GV_FITTOPAGE /* Fit to page */) { + bool enlargeToFit = printer->option( "app-gwenview-enlargeToFit" ) != f; + if ((image.width() > pdWidth || image.height() > pdHeight) || enlargeToFit) { +- size.tqscale( pdWidth, pdHeight, TQSize::ScaleMin ); ++ size.scale( pdWidth, pdHeight, TQSize::ScaleMin ); + } + } else { + if (scaling==GV_SCALE /* Scale To */) { +@@ -452,24 +452,24 @@ void Document::doPaint(KPrinter *printer, TQPainter *painter) { + printer->abort(); + return; + } else if (resp == KMessageBox::No) { // Shrink +- size.tqscale(pdWidth, pdHeight, TQSize::ScaleMin); ++ size.scale(pdWidth, pdHeight, TQSize::ScaleMin); + } + } + } + + // Compute x and y +- if ( tqalignment & TQt::AlignHCenter ) ++ if ( alignment & TQt::AlignHCenter ) + x = (pdWidth - size.width())/2; +- else if ( tqalignment & TQt::AlignLeft ) ++ else if ( alignment & TQt::AlignLeft ) + x = 0; +- else if ( tqalignment & TQt::AlignRight ) ++ else if ( alignment & TQt::AlignRight ) + x = pdWidth - size.width(); + +- if ( tqalignment & TQt::AlignVCenter ) ++ if ( alignment & TQt::AlignVCenter ) + y = (pdHeight - size.height())/2; +- else if ( tqalignment & TQt::AlignTop ) ++ else if ( alignment & TQt::AlignTop ) + y = 0; +- else if ( tqalignment & TQt::AlignBottom ) ++ else if ( alignment & TQt::AlignBottom ) + y = pdHeight - size.height(); + + // Draw, the image will be scaled to fit the given area if necessary +@@ -532,7 +532,7 @@ void Document::saveBeforeClosing() { + if (!d->mModified) return; + + TQString msg=i18n("<qt>The image <b>%1</b> has been modified, do you want to save the changes?</qt>") +- .tqarg(url().prettyURL()); ++ .arg(url().prettyURL()); + + int result=KMessageBox::questionYesNo(dialogParentWidget(), msg, TQString(), + KStdGuiItem::save(), KStdGuiItem::discard(), CONFIG_SAVE_AUTOMATICALLY); +@@ -605,7 +605,7 @@ TQString Document::saveInternal(const KURL& url, const TQCString& format) { + + LOG("Save failed: " << msg); + return TQString("<qt><b>%1</b><br/>") +- .tqarg(i18n("Could not save the image to %1.").tqarg(url.prettyURL())) ++ .arg(i18n("Could not save the image to %1.").arg(url.prettyURL())) + + msg + "</qt>"; + } + +diff --git a/src/gvcore/documentloadedimpl.cpp b/src/gvcore/documentloadedimpl.cpp +index aacea94..31baec0 100644 +--- a/src/gvcore/documentloadedimpl.cpp ++++ b/src/gvcore/documentloadedimpl.cpp +@@ -134,7 +134,7 @@ TQString DocumentLoadedImpl::save(const KURL& _url, const TQCString& format) con + if (!parent.isWritable()) { + return + i18n("The %1 folder is read-only.") +- .tqarg(parent.filePath()); ++ .arg(parent.filePath()); + } + } + } +@@ -152,7 +152,7 @@ TQString DocumentLoadedImpl::save(const KURL& _url, const TQCString& format) con + if (tmp.status()!=0) { + TQString reason( strerror(tmp.status()) ); + return i18n("Could not create a temporary file.\nReason: %1.") +- .tqarg(reason); ++ .arg(reason); + } + TQFile* file=tmp.file(); + msg=localSave(file, format); +@@ -162,7 +162,7 @@ TQString DocumentLoadedImpl::save(const KURL& _url, const TQCString& format) con + if (tmp.status()!=0) { + TQString reason( strerror(tmp.status()) ); + return i18n("Saving image to a temporary file failed.\nReason: %1.") +- .tqarg(reason); ++ .arg(reason); + } + + TQString tmpName=tmp.name(); +@@ -172,11 +172,11 @@ TQString DocumentLoadedImpl::save(const KURL& _url, const TQCString& format) con + // Move the tmp file to the final dest + if (url.isLocalFile()) { + if( ::rename( TQFile::encodeName(tmpName), TQFile::encodeName( url.path())) < 0 ) { +- return i18n("Could not write to %1.").tqarg(url.path()); ++ return i18n("Could not write to %1.").arg(url.path()); + } + } else { + if (!KIO::NetAccess::upload(tmp.name(), url, KApplication::kApplication()->mainWidget() )) { +- return i18n("Could not upload the file to %1.").tqarg(url.prettyURL()); ++ return i18n("Could not upload the file to %1.").arg(url.prettyURL()); + } + } + +diff --git a/src/gvcore/documentloadingimpl.cpp b/src/gvcore/documentloadingimpl.cpp +index 072229e..02020ad 100644 +--- a/src/gvcore/documentloadingimpl.cpp ++++ b/src/gvcore/documentloadingimpl.cpp +@@ -99,7 +99,7 @@ void DocumentLoadingImpl::init() { + emitImageRectUpdated(); + } else { + setImage(image); +- TQMemArray< TQRect > rects = TQRegion(d->mLoader->loadedRegion()).tqrects(); ++ TQMemArray< TQRect > rects = TQRegion(d->mLoader->loadedRegion()).rects(); + for( unsigned int i = 0; i < rects.count(); ++i ) { + emit rectUpdated(rects[i]); + } +diff --git a/src/gvcore/dragpixmapgenerator.h b/src/gvcore/dragpixmapgenerator.h +index efbbd93..308c391 100644 +--- a/src/gvcore/dragpixmapgenerator.h ++++ b/src/gvcore/dragpixmapgenerator.h +@@ -128,7 +128,7 @@ public: + if (listCropped) { + // If list has been cropped, leave space for item count text + height += fm.height(); +- bottomText = i18n("%1 items").tqarg(mItemList.count()); ++ bottomText = i18n("%1 items").arg(mItemList.count()); + width = TQMAX(width, fm.width("... " + bottomText)); + } + +diff --git a/src/gvcore/externaltooldialog.cpp b/src/gvcore/externaltooldialog.cpp +index e579b99..a71351b 100644 +--- a/src/gvcore/externaltooldialog.cpp ++++ b/src/gvcore/externaltooldialog.cpp +@@ -144,7 +144,7 @@ struct ExternalToolDialogPrivate { + for (; item; item=item->nextSibling()) { + if (item==mSelectedItem) continue; + if (name==item->text(0)) { +- KMessageBox::sorry(mContent, i18n("There is already a tool named \"%1\"").tqarg(name)); ++ KMessageBox::sorry(mContent, i18n("There is already a tool named \"%1\"").arg(name)); + return false; + } + } +diff --git a/src/gvcore/externaltoolmanager.cpp b/src/gvcore/externaltoolmanager.cpp +index 4fd4e03..3a43d26 100644 +--- a/src/gvcore/externaltoolmanager.cpp ++++ b/src/gvcore/externaltoolmanager.cpp +@@ -222,7 +222,7 @@ TQDict<KDesktopFile>& ExternalToolManager::desktopFiles() const { + + void ExternalToolManager::hideDesktopFile(KDesktopFile* desktopFile) { + TQFileInfo fi(desktopFile->fileName()); +- TQString name=TQString("%1.desktop").tqarg( fi.baseName(true) ); ++ TQString name=TQString("%1.desktop").arg( fi.baseName(true) ); + d->mDesktopFiles.take(name); + + if (desktopFile->isReadOnly()) { +@@ -240,7 +240,7 @@ KDesktopFile* ExternalToolManager::editSystemDesktopFile(const KDesktopFile* des + TQFileInfo fi(desktopFile->fileName()); + + TQString name=fi.baseName(true); +- d->mDesktopFiles.remove(TQString("%1.desktop").tqarg(name)); ++ d->mDesktopFiles.remove(TQString("%1.desktop").arg(name)); + + return createUserDesktopFile(name); + } +@@ -250,7 +250,7 @@ KDesktopFile* ExternalToolManager::createUserDesktopFile(const TQString& name) { + Q_ASSERT(!name.isEmpty()); + KDesktopFile* desktopFile=new KDesktopFile( + d->mUserToolDir + "/" + name + ".desktop", false); +- d->mDesktopFiles.insert(TQString("%1.desktop").tqarg(name), desktopFile); ++ d->mDesktopFiles.insert(TQString("%1.desktop").arg(name), desktopFile); + + return desktopFile; + } +diff --git a/src/gvcore/filedetailview.cpp b/src/gvcore/filedetailview.cpp +index a8eba49..a7d9f64 100644 +--- a/src/gvcore/filedetailview.cpp ++++ b/src/gvcore/filedetailview.cpp +@@ -525,8 +525,8 @@ void FileDetailView::setShownFileItem(KFileItem* fileItem) + FileDetailViewItem* newShownItem=viewItem(fileItem); + + FileViewBase::setShownFileItem(fileItem); +- if (oldShownItem) oldShownItem->tqrepaint(); +- if (newShownItem) newShownItem->tqrepaint(); ++ if (oldShownItem) oldShownItem->repaint(); ++ if (newShownItem) newShownItem->repaint(); + } + + +diff --git a/src/gvcore/fileopobject.cpp b/src/gvcore/fileopobject.cpp +index 9f09438..cf6b036 100644 +--- a/src/gvcore/fileopobject.cpp ++++ b/src/gvcore/fileopobject.cpp +@@ -259,7 +259,7 @@ void FileOpTrashObject::operator()() { + } else { + TQString filename=TQStyleSheet::escape(mURLList.first().filename()); + response=KMessageBox::warningContinueCancel(mParent, +- i18n("<p>Do you really want to move <b>%1</b> to the trash?</p>").tqarg(filename),i18n("Trash used as a verb", "Trash File"),KGuiItem(i18n("Trash used as a verb", "&Trash"),"edittrash")); ++ i18n("<p>Do you really want to move <b>%1</b> to the trash?</p>").arg(filename),i18n("Trash used as a verb", "Trash File"),KGuiItem(i18n("Trash used as a verb", "&Trash"),"edittrash")); + } + if (response!=KMessageBox::Continue) return; + } +@@ -287,7 +287,7 @@ void FileOpRealDeleteObject::operator()() { + } else { + TQString filename=TQStyleSheet::escape(mURLList.first().filename()); + response=KMessageBox::warningContinueCancel(mParent, +- i18n("<p>Do you really want to delete <b>%1</b>?</p>").tqarg(filename), ++ i18n("<p>Do you really want to delete <b>%1</b>?</p>").arg(filename), + i18n("Delete File"), + KStdGuiItem::del() + ); +@@ -309,7 +309,7 @@ void FileOpRenameObject::operator()() { + TQString filename = srcURL.filename(); + InputDialog dlg(mParent); + dlg.setCaption(i18n("Renaming File")); +- dlg.setLabel(i18n("<p>Rename file <b>%1</b> to:</p>").tqarg(TQStyleSheet::escape(filename))); ++ dlg.setLabel(i18n("<p>Rename file <b>%1</b> to:</p>").arg(TQStyleSheet::escape(filename))); + dlg.setButtonOK( KGuiItem(i18n("&Rename"), "edit") ); + + dlg.lineEdit()->setText(filename); +diff --git a/src/gvcore/filethumbnailview.cpp b/src/gvcore/filethumbnailview.cpp +index 3910e48..c6760fe 100644 +--- a/src/gvcore/filethumbnailview.cpp ++++ b/src/gvcore/filethumbnailview.cpp +@@ -285,7 +285,7 @@ void FileThumbnailView::setThumbnailPixmap(const KFileItem* fileItem, const TQPi + if (size.isValid()) { + iconItem->setImageSize(size); + } +- iconItem->tqrepaint(); ++ iconItem->repaint(); + + // Notify progress + if (d->mProgressWidget) { +diff --git a/src/gvcore/fileviewcontroller.cpp b/src/gvcore/fileviewcontroller.cpp +index bb57a07..1cd795e 100644 +--- a/src/gvcore/fileviewcontroller.cpp ++++ b/src/gvcore/fileviewcontroller.cpp +@@ -747,7 +747,7 @@ void FileViewController::updateViewMode() { + + void FileViewController::updateThumbnailSize(int size) { + size*=SLIDER_RESOLUTION; +- d->mSliderTracker->setText(i18n("Thumbnail size: %1x%2").tqarg(size).tqarg(size)); ++ d->mSliderTracker->setText(i18n("Thumbnail size: %1x%2").arg(size).arg(size)); + FileViewConfig::setThumbnailSize(size); + mFileThumbnailView->setThumbnailSize(size); + Cache::instance()->checkThumbnailSize(size); +diff --git a/src/gvcore/imageloader.cpp b/src/gvcore/imageloader.cpp +index 699d088..c74b7ae 100644 +--- a/src/gvcore/imageloader.cpp ++++ b/src/gvcore/imageloader.cpp +@@ -113,7 +113,7 @@ public: + int getch() { + if (mThread->testCancel()) { + LOG("cancel detected"); +- seStatus(IO_ReadError); ++ setStatus(IO_ReadError); + return -1; + } + return TQBuffer::getch(); +diff --git a/src/gvcore/imagesavedialog.cpp b/src/gvcore/imagesavedialog.cpp +index 7831830..17101e2 100644 +--- a/src/gvcore/imagesavedialog.cpp ++++ b/src/gvcore/imagesavedialog.cpp +@@ -70,7 +70,7 @@ ImageSaveDialog::ImageSaveDialog(KURL& url, const TQCString& imageFormat, TQWidg + if (!patterns.contains(pattern)) patterns.append(pattern); + } + if (patterns.isEmpty()) { +- patterns.append( TQString("*.%1").tqarg(format.lower()) ); ++ patterns.append( TQString("*.%1").arg(format.lower()) ); + } + TQString patternString=patterns.join(" "); + +diff --git a/src/gvcore/imageview.cpp b/src/gvcore/imageview.cpp +index f9da66f..cbfc459 100644 +--- a/src/gvcore/imageview.cpp ++++ b/src/gvcore/imageview.cpp +@@ -113,7 +113,7 @@ as approximate as possible). However when converting from widget to image and ba + this can result in the final rectangle being smaller than the original. + The widgetToImageBounding() function converts from widget to image coordinates + in a way which makes sure the reverse conversion will be at least as large +-as the original tqgeometry. ++as the original geometry. + + There are no conversion functions for only width/height, as their conversion + depends on the position (because of the rounding etc.). For similar reasons +@@ -257,7 +257,7 @@ struct ImageView::Private { + const double zoomValues[] = { 0.5, 1, 2 }; + int nbValues=sizeof(zoomValues) / sizeof(double); + for (int pos=0; pos<nbValues; ++pos) { +- TQString txt=TQString("%1%").tqarg( int(zoomValues[pos]*100) ); ++ TQString txt=TQString("%1%").arg( int(zoomValues[pos]*100) ); + mZoomCombo->insertItem(txt); + } + } +@@ -423,7 +423,7 @@ ImageView::~ImageView() { + void ImageView::slotLoaded() { + if (d->mDocument->isNull()) { + resizeContents(0,0); +- viewport()->tqrepaint(false); ++ viewport()->repaint(false); + return; + } + +@@ -488,7 +488,7 @@ KToggleAction* ImageView::zoomToFit() const { + + + void ImageView::updateFromSettings() { +- // Reset, so that next tqrepaint doesn't possibly take longer because of ++ // Reset, so that next repaint doesn't possibly take longer because of + // smoothing + ImageViewConfig::setMaxRepaintSize(DEFAULT_MAX_REPAINT_SIZE); + ImageViewConfig::setMaxScaleRepaintSize(DEFAULT_MAX_REPAINT_SIZE); +@@ -625,7 +625,7 @@ void ImageView::drawContents(TQPainter* painter,int clipx,int clipy,int clipw,in + TQRect widgetRect = TQRect(0, 0, visibleWidth(), visibleHeight()); + + TQRegion region = TQRegion(widgetRect) - imageRect; +- TQMemArray<TQRect> rects = region.tqrects(); ++ TQMemArray<TQRect> rects = region.rects(); + for(unsigned int pos = 0; pos < rects.count(); ++pos ) { + painter->eraseRect(rects[pos]); + } +@@ -701,7 +701,7 @@ void ImageView::limitPaintSize( PendingPaint& paint ) { + // don't paint more than max_size pixels at a time + int maxHeight = ( maxSize + paint.rect.width() - 1 ) / paint.rect.width(); // round up + maxHeight = TQMAX( maxHeight, 5 ); // at least 5 lines together +- // can't tqrepaint whole paint at once, adjust height and schedule the rest ++ // can't repaint whole paint at once, adjust height and schedule the rest + if( maxHeight < paint.rect.height()) { + TQRect remaining = paint.rect; + remaining.setTop( remaining.top() + maxHeight ); +@@ -781,12 +781,12 @@ void ImageView::slotBusyLevelChanged( BusyLevel level ) { + // How to do painting: + // When something needs to be erased: TQPainter on viewport and eraseRect() + // When whole picture needs to be repainted: fullRepaint() +-// When a part of the picture needs to be updated: viewport()->tqrepaint(area,false) ++// When a part of the picture needs to be updated: viewport()->repaint(area,false) + // All other paints will be changed to progressive painting. + void ImageView::fullRepaint() { + if( !viewport()->isUpdatesEnabled()) return; + cancelPending(); +- viewport()->tqrepaint(false); ++ viewport()->repaint(false); + } + + void ImageView::cancelPending() { +@@ -832,7 +832,7 @@ void ImageView::performPaint( TQPainter* painter, int clipx, int clipy, int clip + int extraPixels = ImageUtils::extraScalePixels( smoothAlgo, zoom()); + TQRect imageRect = d->widgetToImageBounding( TQRect(clipx,clipy,clipw,cliph), extraPixels ); + imageRect = imageRect.intersect( TQRect( 0, 0, d->mDocument->width(), d->mDocument->height())); +- TQMemArray< TQRect > rects = TQRegion(d->mValidImageArea.intersect( imageRect )).tqrects(); ++ TQMemArray< TQRect > rects = TQRegion(d->mValidImageArea.intersect( imageRect )).rects(); + for( unsigned int i = 1; i < rects.count(); ++i ) { + addPendingPaint( secondPass, d->imageToWidget( rects[ i ] )); + } +@@ -1024,7 +1024,7 @@ bool ImageView::eventFilter(TQObject* obj, TQEvent* event) { + return true; + + // Getting/loosing focus causes repaints, but repainting here is expensive, +- // and there's no need to tqrepaint on focus changes, as the focus is not ++ // and there's no need to repaint on focus changes, as the focus is not + // indicated. + case TQEvent::FocusIn: + case TQEvent::FocusOut: +@@ -1313,7 +1313,7 @@ void ImageView::slotImageSizeUpdated() { + + void ImageView::slotImageRectUpdated(const TQRect& imageRect) { + d->mValidImageArea += imageRect; +- viewport()->tqrepaint( d->imageToWidget( imageRect ), false ); ++ viewport()->repaint( d->imageToWidget( imageRect ), false ); + } + + +@@ -1339,7 +1339,7 @@ double ImageView::computeZoomToFit() const { + return 1.0; + } + TQSize size=d->mDocument->image().size(); +- size.tqscale(width(),height(),TQSize::ScaleMin); ++ size.scale(width(),height(),TQSize::ScaleMin); + + double zoom=double(size.width())/d->mDocument->width(); + if (zoom>1.0 && !ImageViewConfig::enlargeSmallImages()) return 1.0; +@@ -1350,7 +1350,7 @@ double ImageView::computeZoomToWidth() const { + if (d->mDocument->isNull()) { + return 1.0; + } +- int sw = verticalScrollBar()->sizeHint().width(); // tqgeometry is not valid before first show() ++ int sw = verticalScrollBar()->sizeHint().width(); // geometry is not valid before first show() + int w = width(); + int dw = d->mDocument->width(); + switch( vScrollBarMode()) { +@@ -1425,7 +1425,7 @@ void ImageView::updateImageOffset() { + int zpixHeight=int(d->mDocument->height() * d->mZoom); + + if (zpixWidth>viewWidth && hScrollBarMode()!=AlwaysOff) { +- // use sizeHint() - tqgeometry is not valid before first show() ++ // use sizeHint() - geometry is not valid before first show() + viewHeight-=horizontalScrollBar()->sizeHint().height(); + } + if (zpixHeight>viewHeight && vScrollBarMode()!=AlwaysOff) { +@@ -1457,7 +1457,7 @@ void ImageView::updateZoomActions() { + if (d->mZoomMode==ZOOM_FREE) { + d->mZoomIn->setEnabled(d->mZoom<MAX_ZOOM); + d->mZoomOut->setEnabled(d->mZoom>1/MAX_ZOOM); +- TQString zoomText=TQString("%1%").tqarg(int(d->mZoom*100)); ++ TQString zoomText=TQString("%1%").arg(int(d->mZoom*100)); + d->mZoomCombo->setCurrentText(zoomText); + } else { + d->mZoomIn->setEnabled(true); +diff --git a/src/gvcore/imageviewtools.cpp b/src/gvcore/imageviewtools.cpp +index 699868a..da9044a 100644 +--- a/src/gvcore/imageviewtools.cpp ++++ b/src/gvcore/imageviewtools.cpp +@@ -36,7 +36,7 @@ namespace Gwenview { + // Helper function + static TQCursor loadCursor(const TQString& name) { + TQString path; +- path=locate("data", TQString("gwenview/cursors/%1.png").tqarg(name)); ++ path=locate("data", TQString("gwenview/cursors/%1.png").arg(name)); + return TQCursor(TQPixmap(path)); + } + +diff --git a/src/gvcore/printdialog.cpp b/src/gvcore/printdialog.cpp +index 98524af..003fb3a 100644 +--- a/src/gvcore/printdialog.cpp ++++ b/src/gvcore/printdialog.cpp +@@ -169,57 +169,57 @@ void PrintDialogPage::setScaleHeight( double value ) { + } + + int PrintDialogPage::getPosition(const TQString& align) { +- int tqalignment; ++ int alignment; + + if (align == i18n("Central-Left")) { +- tqalignment = TQt::AlignLeft | TQt::AlignVCenter; ++ alignment = TQt::AlignLeft | TQt::AlignVCenter; + } else if (align == i18n("Central-Right")) { +- tqalignment = TQt::AlignRight | TQt::AlignVCenter; ++ alignment = TQt::AlignRight | TQt::AlignVCenter; + } else if (align == i18n("Top-Left")) { +- tqalignment = TQt::AlignTop | TQt::AlignLeft; ++ alignment = TQt::AlignTop | TQt::AlignLeft; + } else if (align == i18n("Top-Right")) { +- tqalignment = TQt::AlignTop | TQt::AlignRight; ++ alignment = TQt::AlignTop | TQt::AlignRight; + } else if (align == i18n("Bottom-Left")) { +- tqalignment = TQt::AlignBottom | TQt::AlignLeft; ++ alignment = TQt::AlignBottom | TQt::AlignLeft; + } else if (align == i18n("Bottom-Right")) { +- tqalignment = TQt::AlignBottom | TQt::AlignRight; ++ alignment = TQt::AlignBottom | TQt::AlignRight; + } else if (align == i18n("Top-Central")) { +- tqalignment = TQt::AlignTop | TQt::AlignHCenter; ++ alignment = TQt::AlignTop | TQt::AlignHCenter; + } else if (align == i18n("Bottom-Central")) { +- tqalignment = TQt::AlignBottom | TQt::AlignHCenter; ++ alignment = TQt::AlignBottom | TQt::AlignHCenter; + } else { + // Central +- tqalignment = TQt::AlignCenter; // TQt::AlignHCenter || TQt::AlignVCenter ++ alignment = TQt::AlignCenter; // TQt::AlignHCenter || TQt::AlignVCenter + } + +- return tqalignment; ++ return alignment; + } + + TQString PrintDialogPage::setPosition(int align) { +- TQString tqalignment; ++ TQString alignment; + + if (align == (TQt::AlignLeft | TQt::AlignVCenter)) { +- tqalignment = i18n("Central-Left"); ++ alignment = i18n("Central-Left"); + } else if (align == (TQt::AlignRight | TQt::AlignVCenter)) { +- tqalignment = i18n("Central-Right"); ++ alignment = i18n("Central-Right"); + } else if (align == (TQt::AlignTop | TQt::AlignLeft)) { +- tqalignment = i18n("Top-Left"); ++ alignment = i18n("Top-Left"); + } else if (align == (TQt::AlignTop | TQt::AlignRight)) { +- tqalignment = i18n("Top-Right"); ++ alignment = i18n("Top-Right"); + } else if (align == (TQt::AlignBottom | TQt::AlignLeft)) { +- tqalignment = i18n("Bottom-Left"); ++ alignment = i18n("Bottom-Left"); + } else if (align == (TQt::AlignBottom | TQt::AlignRight)) { +- tqalignment = i18n("Bottom-Right"); ++ alignment = i18n("Bottom-Right"); + } else if (align == (TQt::AlignTop | TQt::AlignHCenter)) { +- tqalignment = i18n("Top-Central"); ++ alignment = i18n("Top-Central"); + } else if (align == (TQt::AlignBottom | TQt::AlignHCenter)) { +- tqalignment = i18n("Bottom-Central"); ++ alignment = i18n("Bottom-Central"); + } else { + // Central: TQt::AlignCenter or (TQt::AlignHCenter || TQt::AlignVCenter) +- tqalignment = i18n("Central"); ++ alignment = i18n("Central"); + } + +- return tqalignment; ++ return alignment; + } + + // SLOTS +diff --git a/src/gvcore/qxcfi.cpp b/src/gvcore/qxcfi.cpp +index 27ad0b9..8e6559f 100644 +--- a/src/gvcore/qxcfi.cpp ++++ b/src/gvcore/qxcfi.cpp +@@ -486,7 +486,7 @@ void XCFImageFormat::readXCF ( TQImageIO* image_io ) + } + + image_io->setImage( xcf_image.image ); +- image_io->seStatus( 0 ); ++ image_io->setStatus( 0 ); + } + + /*! +diff --git a/src/gvcore/xpm.cpp b/src/gvcore/xpm.cpp +index b56ba59..a021c55 100644 +--- a/src/gvcore/xpm.cpp ++++ b/src/gvcore/xpm.cpp +@@ -161,7 +161,7 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc + int i, cpp, ncols, w, h, index = 0; + + if ( iio ) { +- iio->seStatus( 1 ); ++ iio->setStatus( 1 ); + d = iio ? iio->ioDevice() : 0; + d->readLine( buf.data(), buf.size() ); // "/* XPM */" + TQRegExp r( TQString::fromLatin1("/\\*.XPM.\\*/") ); +@@ -291,7 +291,7 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc + } + if ( iio ) { + iio->setImage( image ); +- iio->seStatus( 0 ); // image ok ++ iio->setStatus( 0 ); // image ok + } + } + +@@ -340,7 +340,7 @@ static const char* xpm_color_name( int cpp, int index ) + static void write_xpm_image( TQImageIO * iio ) + { + if ( iio ) +- iio->seStatus( 1 ); ++ iio->setStatus( 1 ); + else + return; + +@@ -424,7 +424,7 @@ static void write_xpm_image( TQImageIO * iio ) + } + s << "};" << endl; + +- iio->seStatus( 0 ); ++ iio->setStatus( 0 ); + } + + // TQt code end --------------------------- +diff --git a/src/gvdirpart/gvdirpart.cpp b/src/gvdirpart/gvdirpart.cpp +index 4745bfe..3f321e5 100644 +--- a/src/gvdirpart/gvdirpart.cpp ++++ b/src/gvdirpart/gvdirpart.cpp +@@ -173,7 +173,7 @@ bool GVDirPart::openURL(const KURL& url) { + void GVDirPart::loaded(const KURL& url) { + TQString caption = url.filename(); + if( !mDocument->image().isNull()) +- caption += TQString(" %1 x %2").tqarg(mDocument->width()).tqarg(mDocument->height()); ++ caption += TQString(" %1 x %2").arg(mDocument->width()).arg(mDocument->height()); + emit setWindowCaption(caption); + emit completed(); + } +diff --git a/src/gvimagepart/gvimagepart.cpp b/src/gvimagepart/gvimagepart.cpp +index 95712b5..95c67e3 100644 +--- a/src/gvimagepart/gvimagepart.cpp ++++ b/src/gvimagepart/gvimagepart.cpp +@@ -194,7 +194,7 @@ void GVImagePart::slotLoading() { + } + + void GVImagePart::slotLoaded(const KURL& url) { +- TQString caption = url.filename() + TQString(" - %1x%2").tqarg(mDocument->width()).tqarg(mDocument->height()); ++ TQString caption = url.filename() + TQString(" - %1x%2").arg(mDocument->width()).arg(mDocument->height()); + emit setWindowCaption(caption); + emit completed(); + emit setStatusBarText(i18n("Done.")); +@@ -363,7 +363,7 @@ void GVImagePart::saveOriginalAs() { + if (!file.open(IO_WriteOnly)) { + KMessageBox::error( + widget(), +- i18n("Could not open '%1' for writing.").tqarg(path)); ++ i18n("Could not open '%1' for writing.").arg(path)); + return; + } + storeData(widget(), &file, data); +diff --git a/src/imageutils/jpegcontent.cpp b/src/imageutils/jpegcontent.cpp +index 5bcb7ef..c007267 100644 +--- a/src/imageutils/jpegcontent.cpp ++++ b/src/imageutils/jpegcontent.cpp +@@ -120,7 +120,7 @@ struct inmem_dest_mgr : public jpeg_destination_mgr { + void inmem_init_destination(j_compress_ptr cinfo) { + inmem_dest_mgr* dest=(inmem_dest_mgr*)(cinfo->dest); + if (dest->mOutput->size()==0) { +- bool result=dest->mOutput->tqresize(INMEM_DST_DELTA); ++ bool result=dest->mOutput->resize(INMEM_DST_DELTA); + Q_ASSERT(result); + } + dest->free_in_buffer=dest->mOutput->size(); +@@ -129,7 +129,7 @@ void inmem_init_destination(j_compress_ptr cinfo) { + + int inmem_empty_output_buffer(j_compress_ptr cinfo) { + inmem_dest_mgr* dest=(inmem_dest_mgr*)(cinfo->dest); +- bool result=dest->mOutput->tqresize(dest->mOutput->size() + INMEM_DST_DELTA); ++ bool result=dest->mOutput->resize(dest->mOutput->size() + INMEM_DST_DELTA); + Q_ASSERT(result); + dest->next_output_byte=(JOCTET*)( dest->mOutput->data() + dest->mOutput->size() - INMEM_DST_DELTA ); + dest->free_in_buffer=INMEM_DST_DELTA; +@@ -141,7 +141,7 @@ void inmem_term_destination(j_compress_ptr cinfo) { + inmem_dest_mgr* dest=(inmem_dest_mgr*)(cinfo->dest); + int finalSize=dest->next_output_byte - (JOCTET*)(dest->mOutput->data()); + Q_ASSERT(finalSize>=0); +- dest->mOutput->tqresize(finalSize); ++ dest->mOutput->resize(finalSize); + } + + +diff --git a/src/imageutils/scale.cpp b/src/imageutils/scale.cpp +index c8a70a7..733dc1a 100644 +--- a/src/imageutils/scale.cpp ++++ b/src/imageutils/scale.cpp +@@ -1929,7 +1929,7 @@ TQImage scale(const TQImage& image, int width, int height, + if( image.isNull()) return image.copy(); + + TQSize newSize( image.size() ); +- newSize.tqscale( TQSize( width, height ), (TQSize::ScaleMode)mode ); // ### remove cast in TQt 4.0 ++ newSize.scale( TQSize( width, height ), (TQSize::ScaleMode)mode ); // ### remove cast in TQt 4.0 + newSize = newSize.expandedTo( TQSize( 1, 1 )); // make sure it doesn't become null + + if ( newSize == image.size() ) return image.copy(); +diff --git a/src/spec/gwenview-mdk.spec b/src/spec/gwenview-mdk.spec +index e2ad754..67a3cdf 100644 +--- a/src/spec/gwenview-mdk.spec ++++ b/src/spec/gwenview-mdk.spec +@@ -272,7 +272,7 @@ rm -rf $RPM_BUILD_ROOT + o Update the EXIF thumbnail when rotating a JPEG file. + o In the folder view, folders now open with a single click (By Daniel Thaler). + o Reworked coordinate conversions in order to avoid subtle paint errors. +- o Remember computed optimal tqrepaint sizes in the config file, ++ o Remember computed optimal repaint sizes in the config file, + so they are available immediately after next start. + o Remember shown URL after session restore. + * Sat Oct 16 2004 Angelo Naselli <anaselli@mandrake.org> 1.1.5-0.3mdk diff --git a/redhat/applications/gwenview/gwenview-3.5.13-rename_a_few_stragglers.patch b/redhat/applications/gwenview/gwenview-3.5.13-rename_a_few_stragglers.patch new file mode 100644 index 000000000..2075f3345 --- /dev/null +++ b/redhat/applications/gwenview/gwenview-3.5.13-rename_a_few_stragglers.patch @@ -0,0 +1,19 @@ +commit b4881a61a24b3df9af47ee6d7e7de4ca8d369f81 +Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Date: 1324747996 -0600 + + Rename a few stragglers + +diff --git a/src/gvcore/imageviewconfig.kcfg b/src/gvcore/imageviewconfig.kcfg +index e5c1e04..d93051a 100644 +--- a/src/gvcore/imageviewconfig.kcfg ++++ b/src/gvcore/imageviewconfig.kcfg +@@ -2,7 +2,7 @@ + <!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd"> + <kcfg> + <include>tqapplication.h</include> +- <include>tqpalette.h</include> ++ <include>palette.h</include> + <kcfgfile name="gwenviewrc"/> + <group name="pixmap widget"> + <entry name="smoothAlgorithm" key="smooth scale" type="Enum"> diff --git a/redhat/applications/gwenview/gwenview-3.5.13-rename_obsolete_tq_methods.patch b/redhat/applications/gwenview/gwenview-3.5.13-rename_obsolete_tq_methods.patch new file mode 100644 index 000000000..4be46b5e1 --- /dev/null +++ b/redhat/applications/gwenview/gwenview-3.5.13-rename_obsolete_tq_methods.patch @@ -0,0 +1,323 @@ +commit 04fccf73370ad95a70b8e107240e50f9fdbf98fc +Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Date: 1324497836 -0600 + + Rename obsolete tq methods to standard names + +diff --git a/src/app/configdialog.cpp b/src/app/configdialog.cpp +index a429095..3dbdb53 100644 +--- a/src/app/configdialog.cpp ++++ b/src/app/configdialog.cpp +@@ -93,9 +93,9 @@ template<class T> + void addConfigPage(KDialogBase* dialog, T* content, const TQString& header, const TQString& name, const char* iconName) { + TQFrame* page=dialog->addPage(name, header, BarIcon(iconName, 32)); + content->reparent(page, TQPoint(0,0)); +- TQVBoxLayout* tqlayout=new TQVBoxLayout(page, 0, KDialog::spacingHint()); +- tqlayout->addWidget(content); +- tqlayout->addStretch(); ++ TQVBoxLayout* layout=new TQVBoxLayout(page, 0, KDialog::spacingHint()); ++ layout->addWidget(content); ++ layout->addStretch(); + } + + template<class T> +diff --git a/src/app/configimagelistpage.ui b/src/app/configimagelistpage.ui +index e2fb15b..01cfe95 100644 +--- a/src/app/configimagelistpage.ui ++++ b/src/app/configimagelistpage.ui +@@ -150,7 +150,7 @@ + </widget> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout6</cstring> ++ <cstring>layout6</cstring> + </property> + <grid> + <property name="name"> +@@ -258,7 +258,7 @@ + </widget> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout7</cstring> ++ <cstring>layout7</cstring> + </property> + <hbox> + <property name="name"> +diff --git a/src/app/configimageviewpage.ui b/src/app/configimageviewpage.ui +index 2f816c0..963f13d 100644 +--- a/src/app/configimageviewpage.ui ++++ b/src/app/configimageviewpage.ui +@@ -73,7 +73,7 @@ + </widget> + <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="6"> + <property name="name"> +- <cstring>tqlayout4</cstring> ++ <cstring>layout4</cstring> + </property> + <hbox> + <property name="name"> +diff --git a/src/app/configmiscpage.ui b/src/app/configmiscpage.ui +index 9df8e96..7e5874e 100644 +--- a/src/app/configmiscpage.ui ++++ b/src/app/configmiscpage.ui +@@ -137,7 +137,7 @@ + </widget> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout1</cstring> ++ <cstring>layout1</cstring> + </property> + <grid> + <property name="name"> +diff --git a/src/app/main.cpp b/src/app/main.cpp +index bef08ae..989bffd 100644 +--- a/src/app/main.cpp ++++ b/src/app/main.cpp +@@ -117,7 +117,7 @@ KDE_EXPORT int kdemain (int argc, char *argv[]) { + aboutData.addCredit("Marco Gazzetta", I18N_NOOP("Fixed crash when trying to generate a thumbnail for a broken JPEG file (v0.16.0)"), "mililani@pobox.com"); + aboutData.addCredit("GeniusR13", I18N_NOOP("Fixed compilation on KDE 3.0 (v0.16.1)"), "geniusr13@gmx.net"); + aboutData.addCredit("Ian Koenig", I18N_NOOP("First RPM spec file"), "iguy@ionsphere.org"); +- aboutData.addCredit("Meni Livne", I18N_NOOP("Toolbar tqlayout patch for RTL languages (v0.16.0)"), "livne@kde.org"); ++ aboutData.addCredit("Meni Livne", I18N_NOOP("Toolbar layout patch for RTL languages (v0.16.0)"), "livne@kde.org"); + aboutData.addCredit("Angelo Naselli", I18N_NOOP("Printing support (v1.0.0)"), "anaselli@linux.it"); + aboutData.addCredit("Jos van den Oever", I18N_NOOP("File info view (v1.0.0)\nPatch to toggle auto-zoom on click (v1.0.0)"), "jos@vandenoever.info"); + aboutData.addCredit("Jeroen Peters", I18N_NOOP("Configurable mouse wheel behavior (v1.1.1)"), "jpeters@coldmail.nl"); +diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp +index 2f2275b..70b42d7 100644 +--- a/src/app/mainwindow.cpp ++++ b/src/app/mainwindow.cpp +@@ -199,8 +199,8 @@ bool MainWindow::queryClose() { + + KConfig* config=KGlobal::config(); + +- // Don't store dock tqlayout if only the image dock is visible. This avoid +- // saving tqlayout when in "fullscreen" or "image only" mode. ++ // Don't store dock layout if only the image dock is visible. This avoid ++ // saving layout when in "fullscreen" or "image only" mode. + if (mFileViewController->isVisible() || mDirViewController->widget()->isVisible()) { + mDockArea->writeDockConfig(config,CONFIG_DOCK_GROUP); + } +@@ -867,8 +867,8 @@ void MainWindow::createWidgets() { + mDockArea->manager()->setSplitterOpaqueResize(true); + + mViewModeWidget=new TQWidget(mCentralStack); +- TQVBoxLayout* tqlayout=new TQVBoxLayout(mViewModeWidget); +- tqlayout->setAutoAdd(true); ++ TQVBoxLayout* layout=new TQVBoxLayout(mViewModeWidget); ++ layout->setAutoAdd(true); + mCentralStack->addWidget(mViewModeWidget); + + // Status bar +@@ -923,7 +923,7 @@ void MainWindow::createWidgets() { + setGeometry(20,20,720,520); + + // Default dock config +- // (The "magic numbers" were found by adjusting the tqlayout from within the ++ // (The "magic numbers" were found by adjusting the layout from within the + // app and looking at the result in the configuration file) + mFolderDock->manualDock(mFileDock, KDockWidget::DockLeft, 4000); + mImageDock->manualDock(mFolderDock, KDockWidget::DockBottom, 3734); +diff --git a/src/app/vtabwidget.cpp b/src/app/vtabwidget.cpp +index 66e9b9e..40a1a0a 100644 +--- a/src/app/vtabwidget.cpp ++++ b/src/app/vtabwidget.cpp +@@ -47,9 +47,9 @@ VTabWidget::VTabWidget(TQWidget* parent) + d->mTabBar->setPosition(KMultiTabBar::Left); + d->mTabBar->setStyle(KMultiTabBar::KDEV3ICON); + d->mStack=new TQWidgetStack(this); +- TQHBoxLayout* tqlayout=new TQHBoxLayout(this); +- tqlayout->add(d->mTabBar); +- tqlayout->add(d->mStack); ++ TQHBoxLayout* layout=new TQHBoxLayout(this); ++ layout->add(d->mTabBar); ++ layout->add(d->mStack); + } + + +diff --git a/src/gvcore/deletedialogbase.ui b/src/gvcore/deletedialogbase.ui +index f7d6f90..7a8ffd4 100644 +--- a/src/gvcore/deletedialogbase.ui ++++ b/src/gvcore/deletedialogbase.ui +@@ -21,7 +21,7 @@ + </property> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout3</cstring> ++ <cstring>layout3</cstring> + </property> + <hbox> + <property name="name"> +diff --git a/src/gvcore/externaltooldialogbase.ui b/src/gvcore/externaltooldialogbase.ui +index 2c25a92..e35f222 100644 +--- a/src/gvcore/externaltooldialogbase.ui ++++ b/src/gvcore/externaltooldialogbase.ui +@@ -153,7 +153,7 @@ + </widget> + <widget class="TQLayoutWidget" row="0" column="0"> + <property name="name"> +- <cstring>tqlayout3</cstring> ++ <cstring>layout3</cstring> + </property> + <grid> + <property name="name"> +diff --git a/src/gvcore/filethumbnailview.cpp b/src/gvcore/filethumbnailview.cpp +index c6760fe..4867781 100644 +--- a/src/gvcore/filethumbnailview.cpp ++++ b/src/gvcore/filethumbnailview.cpp +@@ -77,8 +77,8 @@ public: + ProgressWidget(FileThumbnailView* view, int count) + : TQFrame(view) + { +- TQHBoxLayout* tqlayout=new TQHBoxLayout(this, 3, 3); +- tqlayout->setAutoAdd(true); ++ TQHBoxLayout* layout=new TQHBoxLayout(this, 3, 3); ++ layout->setAutoAdd(true); + setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised ); + + mStop=new TQPushButton(this); +@@ -93,7 +93,7 @@ public: + + void polish() { + TQFrame::polish(); +- setMinimumWidth(tqlayout()->minimumSize().width()); ++ setMinimumWidth(layout()->minimumSize().width()); + //setFixedHeight( mProgressBar->height() ); + setFixedHeight( mStop->height() ); + } +diff --git a/src/gvcore/fileviewcontroller.cpp b/src/gvcore/fileviewcontroller.cpp +index 1cd795e..86a0282 100644 +--- a/src/gvcore/fileviewcontroller.cpp ++++ b/src/gvcore/fileviewcontroller.cpp +@@ -268,10 +268,10 @@ FileViewController::FileViewController(TQWidget* parent,KActionCollection* actio + d->initFilterCombo(); + d->mStack=new TQWidgetStack(this); + +- TQVBoxLayout *tqlayout=new TQVBoxLayout(this); +- tqlayout->addWidget(d->mToolBar); +- tqlayout->addWidget(d->mFilterBar); +- tqlayout->addWidget(d->mStack); ++ TQVBoxLayout *layout=new TQVBoxLayout(this); ++ layout->addWidget(d->mToolBar); ++ layout->addWidget(d->mFilterBar); ++ layout->addWidget(d->mStack); + + // Actions + mSelectFirst=new KAction(i18n("&First"), +diff --git a/src/gvcore/fullscreenbar.cpp b/src/gvcore/fullscreenbar.cpp +index be2b517..bc8375f 100644 +--- a/src/gvcore/fullscreenbar.cpp ++++ b/src/gvcore/fullscreenbar.cpp +@@ -123,7 +123,7 @@ void FullScreenBar::showEvent(TQShowEvent* event) { + if (!d->mFirstShow) return; + d->mFirstShow=false; + move(0, -height()); +- tqlayout()->setResizeMode(TQLayout::Fixed); ++ layout()->setResizeMode(TQLayout::Fixed); + } + + +diff --git a/src/gvcore/imageviewconfig.kcfg b/src/gvcore/imageviewconfig.kcfg +index 6424202..e5c1e04 100644 +--- a/src/gvcore/imageviewconfig.kcfg ++++ b/src/gvcore/imageviewconfig.kcfg +@@ -18,7 +18,7 @@ + <default>false</default> + </entry> + <entry name="backgroundColor" key="background color" type="Color"> +- <default code="true">TQApplication::tqpalette().active().dark()</default> ++ <default code="true">TQApplication::palette().active().dark()</default> + </entry> + <entry name="enlargeSmallImages" key="enlarge small images" type="Bool"> + <default>false</default> +diff --git a/src/gvcore/imageviewcontroller.cpp b/src/gvcore/imageviewcontroller.cpp +index f24a2e8..7387cb8 100644 +--- a/src/gvcore/imageviewcontroller.cpp ++++ b/src/gvcore/imageviewcontroller.cpp +@@ -275,12 +275,12 @@ ImageViewController::ImageViewController(TQWidget* parent, Document* document, K + + d->mContainer=new TQWidget(parent); + d->mContainer->setMinimumWidth(1); // Make sure we can resize the toolbar smaller than its minimum size +- TQVBoxLayout* tqlayout=new TQVBoxLayout(d->mContainer); ++ TQVBoxLayout* layout=new TQVBoxLayout(d->mContainer); + d->mToolBar=new KToolBar(d->mContainer, "", true); + +- tqlayout->add(d->mToolBar); ++ layout->add(d->mToolBar); + d->mStack=new TQWidgetStack(d->mContainer); +- tqlayout->add(d->mStack); ++ layout->add(d->mStack); + + d->mImageView=new ImageView(d->mStack, document, actionCollection); + d->mStack->addWidget(d->mImageView); +diff --git a/src/gvcore/printdialog.cpp b/src/gvcore/printdialog.cpp +index 003fb3a..3b013b3 100644 +--- a/src/gvcore/printdialog.cpp ++++ b/src/gvcore/printdialog.cpp +@@ -82,8 +82,8 @@ PrintDialogPage::PrintDialogPage( Document* document, TQWidget *parent, const ch + mContent = new PrintDialogPageBase(this); + setTitle( mContent->caption() ); + +- TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); +- tqlayout->addWidget( mContent ); ++ TQVBoxLayout *layout = new TQVBoxLayout( this ); ++ layout->addWidget( mContent ); + + connect(mContent->mWidth, TQT_SIGNAL( valueChanged( double )), TQT_SLOT( slotWidthChanged( double ))); + connect(mContent->mHeight, TQT_SIGNAL( valueChanged( double )), TQT_SLOT( slotHeightChanged( double ))); +diff --git a/src/gvcore/printdialogpagebase.ui b/src/gvcore/printdialogpagebase.ui +index 543877c..6ae7696 100644 +--- a/src/gvcore/printdialogpagebase.ui ++++ b/src/gvcore/printdialogpagebase.ui +@@ -24,7 +24,7 @@ + </property> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout2</cstring> ++ <cstring>layout2</cstring> + </property> + <hbox> + <property name="name"> +@@ -170,7 +170,7 @@ + </widget> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout4</cstring> ++ <cstring>layout4</cstring> + </property> + <hbox> + <property name="name"> +@@ -236,7 +236,7 @@ + </widget> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout4</cstring> ++ <cstring>layout4</cstring> + </property> + <hbox> + <property name="name"> +diff --git a/src/gvcore/thumbnaildetailsdialogbase.ui b/src/gvcore/thumbnaildetailsdialogbase.ui +index e9ef011..ae03c98 100644 +--- a/src/gvcore/thumbnaildetailsdialogbase.ui ++++ b/src/gvcore/thumbnaildetailsdialogbase.ui +@@ -29,7 +29,7 @@ + </widget> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout6</cstring> ++ <cstring>layout6</cstring> + </property> + <grid> + <property name="name"> +diff --git a/src/spec/gwenview-mdk.spec b/src/spec/gwenview-mdk.spec +index 67a3cdf..c524954 100644 +--- a/src/spec/gwenview-mdk.spec ++++ b/src/spec/gwenview-mdk.spec +@@ -317,7 +317,7 @@ rm -rf $RPM_BUILD_ROOT + - Avoid data loss if the JPEG images are saved while being rotated by + JPEGTran. + - The back button in Konqueror now works correctly with gvimagepart. +- - The default tqlayout is more user-friendly. ++ - The default layout is more user-friendly. + - Non-trivial URLs (e.g. http query URL) are correctly handled. + - You can now drop images on the image view. + diff --git a/redhat/applications/gwenview/gwenview-3.5.13-rename_old_tq_method.patch b/redhat/applications/gwenview/gwenview-3.5.13-rename_old_tq_method.patch new file mode 100644 index 000000000..2f9e42d5b --- /dev/null +++ b/redhat/applications/gwenview/gwenview-3.5.13-rename_old_tq_method.patch @@ -0,0 +1,796 @@ +commit d0bdd0d7a768f9935b521f3bd12a4cd72739b96f +Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Date: 1324253323 -0600 + + Rename old tq methods that no longer need a unique name + +diff --git a/src/app/bookmarkdialogbase.ui b/src/app/bookmarkdialogbase.ui +index d4db944..08ccea2 100644 +--- a/src/app/bookmarkdialogbase.ui ++++ b/src/app/bookmarkdialogbase.ui +@@ -20,7 +20,7 @@ + <verstretch>0</verstretch> + </sizepolicy> + </property> +- <property name="tqminimumSize"> ++ <property name="minimumSize"> + <size> + <width>400</width> + <height>0</height> +@@ -88,7 +88,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>383</width> + <height>16</height> +diff --git a/src/app/bookmarkviewcontroller.cpp b/src/app/bookmarkviewcontroller.cpp +index b40f70e..68ee9f0 100644 +--- a/src/app/bookmarkviewcontroller.cpp ++++ b/src/app/bookmarkviewcontroller.cpp +@@ -98,7 +98,7 @@ public: + if ( !item) return; + if (item->mBookmark.isGroup()) return; + +- TQRect rect=mListView->tqitemRect(item); ++ TQRect rect=mListView->itemRect(item); + tip(rect, item->mBookmark.url().prettyURL()); + }; + +diff --git a/src/app/configdialog.cpp b/src/app/configdialog.cpp +index 0fb33df..d274188 100644 +--- a/src/app/configdialog.cpp ++++ b/src/app/configdialog.cpp +@@ -289,7 +289,7 @@ void ConfigDialog::emptyCache() { + + KURL url; + url.setPath(dir); +- if (KIO::NetAccess::del(url, tqtopLevelWidget()) ) { ++ if (KIO::NetAccess::del(url, topLevelWidget()) ) { + KMessageBox::information( this,i18n("Cache emptied.") ); + } + } +diff --git a/src/app/configfileoperationspage.ui b/src/app/configfileoperationspage.ui +index 78ac6d3..451a030 100644 +--- a/src/app/configfileoperationspage.ui ++++ b/src/app/configfileoperationspage.ui +@@ -93,7 +93,7 @@ + <property name="sizeType"> + <enum>Fixed</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>21</width> + <height>16</height> +diff --git a/src/app/configfullscreenpage.ui b/src/app/configfullscreenpage.ui +index e7da709..855869f 100644 +--- a/src/app/configfullscreenpage.ui ++++ b/src/app/configfullscreenpage.ui +@@ -43,7 +43,7 @@ + <property name="sizeType"> + <enum>Fixed</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>21</width> + <height>16</height> +@@ -131,7 +131,7 @@ You can use the following keywords to format the On Screen Display: + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>21</width> + <height>18</height> +diff --git a/src/app/configimagelistpage.ui b/src/app/configimagelistpage.ui +index 6670dbd..e2fb15b 100644 +--- a/src/app/configimagelistpage.ui ++++ b/src/app/configimagelistpage.ui +@@ -40,7 +40,7 @@ + <property name="sizeType"> + <enum>Fixed</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>21</width> + <height>16</height> +@@ -131,7 +131,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>20</width> + <height>0</height> +@@ -166,7 +166,7 @@ + <property name="sizeType"> + <enum>Fixed</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>21</width> + <height>20</height> +@@ -217,7 +217,7 @@ + <property name="sizeType"> + <enum>Fixed</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>21</width> + <height>16</height> +diff --git a/src/app/configimageviewpage.ui b/src/app/configimageviewpage.ui +index a99b945..32fb346 100644 +--- a/src/app/configimageviewpage.ui ++++ b/src/app/configimageviewpage.ui +@@ -56,7 +56,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>181</width> + <height>21</height> +@@ -238,7 +238,7 @@ Use this option if your computer is not very fast.</string> + <property name="sizeType"> + <enum>Fixed</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>21</width> + <height>16</height> +diff --git a/src/app/configmiscpage.ui b/src/app/configmiscpage.ui +index 9b69c2d..9df8e96 100644 +--- a/src/app/configmiscpage.ui ++++ b/src/app/configmiscpage.ui +@@ -92,7 +92,7 @@ + <property name="sizeType"> + <enum>Fixed</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>20</width> + <height>24</height> +@@ -120,7 +120,7 @@ + <property name="sizeType"> + <enum>Fixed</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>20</width> + <height>24</height> +@@ -153,7 +153,7 @@ + <property name="sizeType"> + <enum>Fixed</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>11</width> + <height>20</height> +@@ -191,7 +191,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>21</width> + <height>41</height> +diff --git a/src/app/configslideshowpage.ui b/src/app/configslideshowpage.ui +index 62ab807..ccf0c15 100644 +--- a/src/app/configslideshowpage.ui ++++ b/src/app/configslideshowpage.ui +@@ -88,7 +88,7 @@ When this option is enabled, the slideshow will stop on the last image of the fo + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>180</width> + <height>20</height> +diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp +index 1464a09..f9acc9b 100644 +--- a/src/app/mainwindow.cpp ++++ b/src/app/mainwindow.cpp +@@ -871,7 +871,7 @@ void MainWindow::createWidgets() { + tqlayout->setAutoAdd(true); + mCentralStack->addWidget(mViewModeWidget); + +- // tqStatus bar ++ // Status bar + mSBDetailLabel=new TQLabel("", statusBar()); + + mSBHintLabel=new TruncatedTextLabel(statusBar()); +@@ -1216,7 +1216,7 @@ void MainWindow::createLocationToolBar() { + + // Do not let the combobox get wider than available space, as this would + // hide the toolbuttons after it +- mURLEdit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); ++ mURLEdit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); + + // Avoid stealing focus + mURLEdit->setFocusPolicy(TQ_ClickFocus); +diff --git a/src/app/truncatedtextlabel.h b/src/app/truncatedtextlabel.h +index 8e126ed..2351890 100644 +--- a/src/app/truncatedtextlabel.h ++++ b/src/app/truncatedtextlabel.h +@@ -39,14 +39,14 @@ public: + TruncatedTextLabel(TQWidget* parent) + : TQLabel(parent) {} + +- TQSize tqminimumSizeHint() const { +- TQSize size=TQLabel::tqminimumSizeHint(); ++ TQSize minimumSizeHint() const { ++ TQSize size=TQLabel::minimumSizeHint(); + size.setWidth(-1); + return size; + } + +- TQSize tqsizeHint() const { +- return TQSize(contentsRect().width(), TQLabel::tqsizeHint().height()); ++ TQSize sizeHint() const { ++ return TQSize(contentsRect().width(), TQLabel::sizeHint().height()); + } + + void setText(const TQString& text) { +diff --git a/src/gvcore/cursortracker.cpp b/src/gvcore/cursortracker.cpp +index 00f1736..3569dc8 100644 +--- a/src/gvcore/cursortracker.cpp ++++ b/src/gvcore/cursortracker.cpp +@@ -79,7 +79,7 @@ TipTracker::TipTracker(const TQString& txt, TQWidget* reference) + setPalette(TQToolTip::palette()); + setFrameStyle(TQFrame::Plain | TQFrame::Box); + setLineWidth(1); +- tqsetAlignment(AlignAuto | AlignTop); ++ setAlignment(AlignAuto | AlignTop); + } + + +diff --git a/src/gvcore/deletedialog.cpp b/src/gvcore/deletedialog.cpp +index 3d6308b..9fdfac5 100644 +--- a/src/gvcore/deletedialog.cpp ++++ b/src/gvcore/deletedialog.cpp +@@ -113,9 +113,9 @@ bool DeleteDialog::shouldDelete() const { + } + + +-TQSize DeleteDialog::tqsizeHint() const { ++TQSize DeleteDialog::sizeHint() const { + m_widget->adjustSize(); +- TQSize hint = m_widget->tqminimumSize(); ++ TQSize hint = m_widget->minimumSize(); + hint = calculateSize(hint.width(), hint.height()); + + // For some reason calculateSize does not return a correct height. As I'm +diff --git a/src/gvcore/deletedialog.h b/src/gvcore/deletedialog.h +index 6825368..1bdc5ab 100644 +--- a/src/gvcore/deletedialog.h ++++ b/src/gvcore/deletedialog.h +@@ -36,7 +36,7 @@ public: + void setURLList(const KURL::List &files); + bool shouldDelete() const; + +- TQSize tqsizeHint() const; ++ TQSize sizeHint() const; + + protected slots: + virtual void accept(); +diff --git a/src/gvcore/deletedialogbase.ui b/src/gvcore/deletedialogbase.ui +index 4725920..6abab10 100644 +--- a/src/gvcore/deletedialogbase.ui ++++ b/src/gvcore/deletedialogbase.ui +@@ -47,7 +47,7 @@ + <property name="name"> + <cstring>ddDeleteText</cstring> + </property> +- <property name="tqminimumSize"> ++ <property name="minimumSize"> + <size> + <width>0</width> + <height>60</height> +diff --git a/src/gvcore/externaltooldialogbase.ui b/src/gvcore/externaltooldialogbase.ui +index 00d2954..2c25a92 100644 +--- a/src/gvcore/externaltooldialogbase.ui ++++ b/src/gvcore/externaltooldialogbase.ui +@@ -20,7 +20,7 @@ + <verstretch>0</verstretch> + </sizepolicy> + </property> +- <property name="tqminimumSize"> ++ <property name="minimumSize"> + <size> + <width>720</width> + <height>0</height> +@@ -49,7 +49,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>487</width> + <height>16</height> +@@ -304,7 +304,7 @@ You can use keywords in the Command field: + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>21</width> + <height>140</height> +diff --git a/src/gvcore/filedetailview.cpp b/src/gvcore/filedetailview.cpp +index f061c13..a8eba49 100644 +--- a/src/gvcore/filedetailview.cpp ++++ b/src/gvcore/filedetailview.cpp +@@ -125,8 +125,8 @@ FileDetailView::FileDetailView(TQWidget *parent, const char *name) + setDropHighlighter(false); + + int size = IconSize(KIcon::Small); +- mShownItemUnselectedPixmap = createShownItemPixmap(size, tqcolorGroup().highlight()); +- mShownItemSelectedPixmap = createShownItemPixmap(size, tqcolorGroup().highlightedText()); ++ mShownItemUnselectedPixmap = createShownItemPixmap(size, colorGroup().highlight()); ++ mShownItemSelectedPixmap = createShownItemPixmap(size, colorGroup().highlightedText()); + } + + +diff --git a/src/gvcore/filedetailviewitem.h b/src/gvcore/filedetailviewitem.h +index 1104bce..a0ad5df 100644 +--- a/src/gvcore/filedetailviewitem.h ++++ b/src/gvcore/filedetailviewitem.h +@@ -71,7 +71,7 @@ public: + + TQRect rect() const + { +- TQRect r = listView()->tqitemRect(this); ++ TQRect r = listView()->itemRect(this); + return TQRect( listView()->viewportToContents( r.topLeft() ), + TQSize( r.width(), r.height() ) ); + } +diff --git a/src/gvcore/fileopobject.cpp b/src/gvcore/fileopobject.cpp +index e72d192..9f09438 100644 +--- a/src/gvcore/fileopobject.cpp ++++ b/src/gvcore/fileopobject.cpp +@@ -89,7 +89,7 @@ void FileOpObject::slotResult(KIO::Job* job) { + + + void FileOpObject::polishJob(KIO::Job* job) { +- job->setWindow(mParent->tqtopLevelWidget()); ++ job->setWindow(mParent->topLevelWidget()); + connect( job, TQT_SIGNAL( result(KIO::Job*) ), + this, TQT_SLOT( slotResult(KIO::Job*) ) ); + } +diff --git a/src/gvcore/filethumbnailview.cpp b/src/gvcore/filethumbnailview.cpp +index 51445be..3910e48 100644 +--- a/src/gvcore/filethumbnailview.cpp ++++ b/src/gvcore/filethumbnailview.cpp +@@ -93,7 +93,7 @@ public: + + void polish() { + TQFrame::polish(); +- setMinimumWidth(tqlayout()->tqminimumSize().width()); ++ setMinimumWidth(tqlayout()->minimumSize().width()); + //setFixedHeight( mProgressBar->height() ); + setFixedHeight( mStop->height() ); + } +@@ -142,7 +142,7 @@ struct FileThumbnailView::Private { + mWaitThumbnail.fill(view->paletteBackgroundColor()); + TQPainter painter(&mWaitThumbnail); + +- painter.setPen(view->tqcolorGroup().button()); ++ painter.setPen(view->colorGroup().button()); + painter.drawRect(0,0,mThumbnailSize,mThumbnailSize); + painter.drawPixmap( + (mThumbnailSize-mWaitPixmap.width())/2, +diff --git a/src/gvcore/filethumbnailviewitem.cpp b/src/gvcore/filethumbnailviewitem.cpp +index 65da494..cd607b7 100644 +--- a/src/gvcore/filethumbnailviewitem.cpp ++++ b/src/gvcore/filethumbnailviewitem.cpp +@@ -271,16 +271,16 @@ void FileThumbnailViewItem::calcRect(const TQString&) { + textH+=(*it)->height(); + } + +- TQRect tqitemRect(x(), y(), view->gridX(), 0); ++ TQRect itemRect(x(), y(), view->gridX(), 0); + TQRect itemPixmapRect(PADDING, PADDING, thumbnailSize, thumbnailSize); + TQRect itemTextRect(0, 0, textW, textH); + if (isRight) { +- tqitemRect.setHeight( TQMAX(thumbnailSize + PADDING*2, textH) ); ++ itemRect.setHeight( TQMAX(thumbnailSize + PADDING*2, textH) ); + itemTextRect.moveLeft(thumbnailSize + PADDING * 2 ); +- itemTextRect.moveTop((tqitemRect.height() - textH)/2); ++ itemTextRect.moveTop((itemRect.height() - textH)/2); + } else { +- itemPixmapRect.moveLeft( (tqitemRect.width() - itemPixmapRect.width()) / 2 ); +- tqitemRect.setHeight(thumbnailSize + PADDING*3 + textH); ++ itemPixmapRect.moveLeft( (itemRect.width() - itemPixmapRect.width()) / 2 ); ++ itemRect.setHeight(thumbnailSize + PADDING*3 + textH); + itemTextRect.moveLeft(PADDING); + itemTextRect.moveTop(thumbnailSize + PADDING * 2); + } +@@ -292,8 +292,8 @@ void FileThumbnailViewItem::calcRect(const TQString&) { + if ( itemTextRect != textRect() ) { + setTextRect( itemTextRect ); + } +- if ( tqitemRect != rect() ) { +- setItemRect( tqitemRect ); ++ if ( itemRect != rect() ) { ++ setItemRect( itemRect ); + } + } + +diff --git a/src/gvcore/filethumbnailviewitem.h b/src/gvcore/filethumbnailviewitem.h +index b242355..d3a1063 100644 +--- a/src/gvcore/filethumbnailviewitem.h ++++ b/src/gvcore/filethumbnailviewitem.h +@@ -52,7 +52,7 @@ public: + void updateLines(); + + protected: +- void paintItem(TQPainter* painter, const TQColorGroup& tqcolorGroup); ++ void paintItem(TQPainter* painter, const TQColorGroup& colorGroup); + void calcRect( const TQString& text_=TQString() ); + void paintFocus(TQPainter*, const TQColorGroup&) {} + bool acceptDrop(const TQMimeSource*) const; +diff --git a/src/gvcore/fileviewcontroller.cpp b/src/gvcore/fileviewcontroller.cpp +index bdacf01..bb57a07 100644 +--- a/src/gvcore/fileviewcontroller.cpp ++++ b/src/gvcore/fileviewcontroller.cpp +@@ -191,7 +191,7 @@ public: + + void initFilterBar() { + mFilterBar=new FilterBar(that); +- mFilterBar->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); ++ mFilterBar->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); + mFilterBar->hide(); + + TQIconSet resetIS=BarIcon("locationbar_erase"); +@@ -256,7 +256,7 @@ FileViewController::FileViewController(TQWidget* parent,KActionCollection* actio + : TQWidget(parent) + , mMode(FILE_LIST) + , mPrefetch( NULL ) +-, mChangeDirtqStatus(CHANGE_DIR_STATUS_NONE) ++, mChangeDirStatus(CHANGE_DIR_STATUS_NONE) + , mBrowsing(false) + , mSelecting(false) + { +@@ -338,7 +338,7 @@ FileViewController::FileViewController(TQWidget* parent,KActionCollection* actio + + // Dir lister + mDirLister=new DirLister; +- mDirLister->setMainWindow(tqtopLevelWidget()); ++ mDirLister->setMainWindow(topLevelWidget()); + connect(mDirLister,TQT_SIGNAL(clear()), + TQT_TQOBJECT(this),TQT_SLOT(dirListerClear()) ); + +@@ -575,13 +575,13 @@ void FileViewController::slotSelectNext() { + } + + void FileViewController::slotSelectPreviousDir() { +- mChangeDirtqStatus = CHANGE_DIR_STATUS_PREV; ++ mChangeDirStatus = CHANGE_DIR_STATUS_PREV; + mDirLister->clearError(); + mDirLister->openURL(mDirURL.upURL()); + } + + void FileViewController::slotSelectNextDir() { +- mChangeDirtqStatus = CHANGE_DIR_STATUS_NEXT; ++ mChangeDirStatus = CHANGE_DIR_STATUS_NEXT; + mDirLister->clearError(); + mDirLister->openURL(mDirURL.upURL()); + } +@@ -1102,12 +1102,12 @@ void FileViewController::delayedDirListerCompleted() { + mFileThumbnailView->sort(mFileThumbnailView->sortDirection()); + } + +- if (mChangeDirtqStatus != CHANGE_DIR_STATUS_NONE) { ++ if (mChangeDirStatus != CHANGE_DIR_STATUS_NONE) { + KFileItem *item; + TQString fileName = mDirURL.filename(); + for (item=currentFileView()->firstFileItem(); item; item=currentFileView()->nextItem(item) ) { + if (item->name() == fileName) { +- if (mChangeDirtqStatus == CHANGE_DIR_STATUS_NEXT) { ++ if (mChangeDirStatus == CHANGE_DIR_STATUS_NEXT) { + do { + item=currentFileView()->nextItem(item); + } while (item && !Archive::fileItemIsDirOrArchive(item)); +@@ -1119,7 +1119,7 @@ void FileViewController::delayedDirListerCompleted() { + break; + }; + } +- mChangeDirtqStatus = CHANGE_DIR_STATUS_NONE; ++ mChangeDirStatus = CHANGE_DIR_STATUS_NONE; + if (!item) { + mDirLister->openURL(mDirURL); + } else { +diff --git a/src/gvcore/fileviewcontroller.h b/src/gvcore/fileviewcontroller.h +index de0de53..8339659 100644 +--- a/src/gvcore/fileviewcontroller.h ++++ b/src/gvcore/fileviewcontroller.h +@@ -227,7 +227,7 @@ private: + CHANGE_DIR_STATUS_NONE, + CHANGE_DIR_STATUS_PREV, + CHANGE_DIR_STATUS_NEXT +- } mChangeDirtqStatus; ++ } mChangeDirStatus; + + bool mBrowsing; + bool mSelecting; +diff --git a/src/gvcore/filterbar.ui b/src/gvcore/filterbar.ui +index b407ce1..2c9f11c 100644 +--- a/src/gvcore/filterbar.ui ++++ b/src/gvcore/filterbar.ui +@@ -64,7 +64,7 @@ + <property name="sizeType"> + <enum>Maximum</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>16</width> + <height>16</height> +@@ -125,7 +125,7 @@ equal to this date</string> + <property name="sizeType"> + <enum>Maximum</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>16</width> + <height>16</height> +@@ -185,7 +185,7 @@ equal to this date</string> + <property name="sizeType"> + <enum>Maximum</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>16</width> + <height>16</height> +@@ -210,7 +210,7 @@ equal to this date</string> + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>16</width> + <height>16</height> +diff --git a/src/gvcore/fullscreenbar.cpp b/src/gvcore/fullscreenbar.cpp +index 311b98d..be2b517 100644 +--- a/src/gvcore/fullscreenbar.cpp ++++ b/src/gvcore/fullscreenbar.cpp +@@ -83,8 +83,8 @@ FullScreenBar::FullScreenBar(TQWidget* parent) + setIconSize(FULLSCREEN_ICON_SIZE); + setMovingEnabled(false); + +- TQColor bg=tqcolorGroup().highlight(); +- TQColor fg=tqcolorGroup().highlightedText(); ++ TQColor bg=colorGroup().highlight(); ++ TQColor fg=colorGroup().highlightedText(); + TQPalette pal(palette()); + pal.setColor(TQColorGroup::Background, bg); + pal.setColor(TQColorGroup::Foreground, fg); +diff --git a/src/gvcore/imageloader.cpp b/src/gvcore/imageloader.cpp +index 06a9011..699d088 100644 +--- a/src/gvcore/imageloader.cpp ++++ b/src/gvcore/imageloader.cpp +@@ -113,7 +113,7 @@ public: + int getch() { + if (mThread->testCancel()) { + LOG("cancel detected"); +- setqStatus(IO_ReadError); ++ seStatus(IO_ReadError); + return -1; + } + return TQBuffer::getch(); +diff --git a/src/gvcore/imageview.cpp b/src/gvcore/imageview.cpp +index a6c5b9f..f9da66f 100644 +--- a/src/gvcore/imageview.cpp ++++ b/src/gvcore/imageview.cpp +@@ -1350,7 +1350,7 @@ double ImageView::computeZoomToWidth() const { + if (d->mDocument->isNull()) { + return 1.0; + } +- int sw = verticalScrollBar()->tqsizeHint().width(); // tqgeometry is not valid before first show() ++ int sw = verticalScrollBar()->sizeHint().width(); // tqgeometry is not valid before first show() + int w = width(); + int dw = d->mDocument->width(); + switch( vScrollBarMode()) { +@@ -1370,7 +1370,7 @@ double ImageView::computeZoomToHeight() const { + if (d->mDocument->isNull()) { + return 1.0; + } +- int sh = horizontalScrollBar()->tqsizeHint().height(); ++ int sh = horizontalScrollBar()->sizeHint().height(); + int h = height(); + int dh = d->mDocument->height(); + switch( vScrollBarMode()) { +@@ -1425,11 +1425,11 @@ void ImageView::updateImageOffset() { + int zpixHeight=int(d->mDocument->height() * d->mZoom); + + if (zpixWidth>viewWidth && hScrollBarMode()!=AlwaysOff) { +- // use tqsizeHint() - tqgeometry is not valid before first show() +- viewHeight-=horizontalScrollBar()->tqsizeHint().height(); ++ // use sizeHint() - tqgeometry is not valid before first show() ++ viewHeight-=horizontalScrollBar()->sizeHint().height(); + } + if (zpixHeight>viewHeight && vScrollBarMode()!=AlwaysOff) { +- viewWidth-=verticalScrollBar()->tqsizeHint().width(); ++ viewWidth-=verticalScrollBar()->sizeHint().width(); + } + + d->mXOffset=TQMAX(0,(viewWidth-zpixWidth)/2); +diff --git a/src/gvcore/printdialogpagebase.ui b/src/gvcore/printdialogpagebase.ui +index 6d92eda..543877c 100644 +--- a/src/gvcore/printdialogpagebase.ui ++++ b/src/gvcore/printdialogpagebase.ui +@@ -98,7 +98,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>101</width> + <height>21</height> +@@ -186,7 +186,7 @@ + <property name="sizeType"> + <enum>Fixed</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>20</width> + <height>20</height> +@@ -214,7 +214,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>240</width> + <height>21</height> +@@ -252,7 +252,7 @@ + <property name="sizeType"> + <enum>Fixed</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>20</width> + <height>20</height> +@@ -351,7 +351,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>16</width> + <height>20</height> +diff --git a/src/gvcore/qxcfi.cpp b/src/gvcore/qxcfi.cpp +index 9fb146a..27ad0b9 100644 +--- a/src/gvcore/qxcfi.cpp ++++ b/src/gvcore/qxcfi.cpp +@@ -486,7 +486,7 @@ void XCFImageFormat::readXCF ( TQImageIO* image_io ) + } + + image_io->setImage( xcf_image.image ); +- image_io->setqStatus( 0 ); ++ image_io->seStatus( 0 ); + } + + /*! +diff --git a/src/gvcore/thumbnaildetailsdialogbase.ui b/src/gvcore/thumbnaildetailsdialogbase.ui +index 1dd6646..e9ef011 100644 +--- a/src/gvcore/thumbnaildetailsdialogbase.ui ++++ b/src/gvcore/thumbnaildetailsdialogbase.ui +@@ -45,7 +45,7 @@ + <property name="sizeType"> + <enum>Fixed</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>21</width> + <height>20</height> +@@ -96,7 +96,7 @@ + <property name="sizeType"> + <enum>Fixed</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>21</width> + <height>21</height> +diff --git a/src/gvcore/xpm.cpp b/src/gvcore/xpm.cpp +index cc2cabc..b56ba59 100644 +--- a/src/gvcore/xpm.cpp ++++ b/src/gvcore/xpm.cpp +@@ -74,7 +74,7 @@ static TQString fbname( const TQString &fileName ) // get file basename (sort of + s = s.mid( i ); + if ( (i = s.findRev('\\')) >= 0 ) + s = s.mid( i ); +- TQRegExp r( TQString::tqfromLatin1("[a-zA-Z][a-zA-Z0-9_]*") ); ++ TQRegExp r( TQString::fromLatin1("[a-zA-Z][a-zA-Z0-9_]*") ); + int p = r.search( s ); + if ( p == -1 ) + s.truncate( 0 ); +@@ -82,7 +82,7 @@ static TQString fbname( const TQString &fileName ) // get file basename (sort of + s = s.mid( p, r.matchedLength() ); + } + if ( s.isEmpty() ) +- s = TQString::tqfromLatin1( "dummy" ); ++ s = TQString::fromLatin1( "dummy" ); + return s; + } + +@@ -161,10 +161,10 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc + int i, cpp, ncols, w, h, index = 0; + + if ( iio ) { +- iio->setqStatus( 1 ); ++ iio->seStatus( 1 ); + d = iio ? iio->ioDevice() : 0; + d->readLine( buf.data(), buf.size() ); // "/* XPM */" +- TQRegExp r( TQString::tqfromLatin1("/\\*.XPM.\\*/") ); ++ TQRegExp r( TQString::fromLatin1("/\\*.XPM.\\*/") ); + if ( buf.find(r) == -1 ) + return; // bad magic + } else if ( !source ) { +@@ -291,7 +291,7 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc + } + if ( iio ) { + iio->setImage( image ); +- iio->setqStatus( 0 ); // image ok ++ iio->seStatus( 0 ); // image ok + } + } + +@@ -340,7 +340,7 @@ static const char* xpm_color_name( int cpp, int index ) + static void write_xpm_image( TQImageIO * iio ) + { + if ( iio ) +- iio->setqStatus( 1 ); ++ iio->seStatus( 1 ); + else + return; + +@@ -424,7 +424,7 @@ static void write_xpm_image( TQImageIO * iio ) + } + s << "};" << endl; + +- iio->setqStatus( 0 ); ++ iio->seStatus( 0 ); + } + + // TQt code end --------------------------- +diff --git a/src/tsthread/tsthread.cpp b/src/tsthread/tsthread.cpp +index 6363f2e..c845cce 100644 +--- a/src/tsthread/tsthread.cpp ++++ b/src/tsthread/tsthread.cpp +@@ -175,7 +175,7 @@ void TSThread::customEvent( TQCustomEvent* ev ) + } + bool deleted = false; + deleted_flag = &deleted; // this is like TQGuardedPtr for self, but faster +- int signal_id = e->object->tqmetaObject()->findSignal( normalizeSignalSlot( e->signal ).data() + 1, true ); ++ int signal_id = e->object->metaObject()->findSignal( normalizeSignalSlot( e->signal ).data() + 1, true ); + if( signal_id >= 0 ) + e->object->qt_emit( signal_id, e->args ); + else diff --git a/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec b/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec index d8b62c9a1..2946df28c 100644 --- a/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec +++ b/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec @@ -1,12 +1,13 @@ # Default version for this component %define kdecomp gwenview %define version 1.4.2 -%define release 6 +%define release 7 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc +%define _docdir %{_datadir}/doc +%define _mandir %{_datadir}/man %endif # TDE 3.5.13 specific building variables @@ -33,8 +34,26 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz -# TDE 3.5.13 on RHEL/Fedora specific patches -Patch0: gwenview-3.5.13-jpegint-ftbfs.patch +# [gwenview] Rename old tq methods that no longer need a unique name [Commit #d0bdd0d7] +Patch1: gwenview-3.5.13-rename_old_tq_method.patch +# [gwenview] Remove additional unneeded tq method conversions [Commit #eba1d381] +Patch2: gwenview-3.5.13-remove_additional_tq_conversions.patch +# [gwenview] Rename obsolete tq methods to standard names [Commit #04fccf73] +Patch3: gwenview-3.5.13-rename_obsolete_tq_methods.patch +# [gwenview] Rename a few stragglers [Commit #b4881a61] +Patch4: gwenview-3.5.13-rename_a_few_stragglers.patch +# [gwenview] Fix FTBFS [Commit #1ca2f739] +Patch5: gwenview-3.5.13-fix_ftbfs.patch +# [gwenview] Fix FTBFS in jpeg code [Commit #ace6f270] +Patch6: gwenview-3.5.13-fix_ftbfs_in_jpeg_code.patch +# [gwenview] Fix linear alphabet string errors [Commit #9cb99cdb] +Patch7: gwenview-3.5.13-fix_alphabet_string_error.patch +# [gwenview] Fix building with libpng 1.5. [Commit #303be455] +Patch8: gwenview-3.5.13-fix_building_libpng15.patch +# [gwenview] Fix inadvertent tqt changes. Part of an extensive cleanup of various problems +# with kipi-plugins, digikam, and gwenview to resolve bug reports 241, 962, 963. [Commit #1eac443e] +Patch9: gwenview-3.5.13-fix_various_problems.patch + BuildRequires: tqtinterface-devel @@ -51,7 +70,7 @@ Conflicts: kdegraphics %description -Gwenview is a fast and easy to use image viewer/browser for KDE. +Gwenview is a fast and easy to use image viewer/browser for TDE. All common image formats are supported, such as PNG(including transparency), JPEG(including EXIF tags and lossless transformations), GIF, XCF (Gimp image format), BMP, XPM and others. Standard features include slideshow, @@ -66,20 +85,30 @@ KIPI image framework. %prep %setup -q -n applications/%{kdecomp} -%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 + # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" %build +unset QTDIR || : ; source /etc/profile.d/qt.sh export PATH="%{_bindir}:${PATH}" export LDFLAGS="-L%{_libdir} -I%{_includedir}" @@ -123,12 +152,18 @@ fi %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done +/sbin/ldconfig %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done +/sbin/ldconfig %files %defattr(-,root,root,-) @@ -140,17 +175,23 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_datadir}/apps/*/ %{_datadir}/config.kcfg/* %{tde_docdir}/HTML/en/*/ -%{_datadir}/icons/*/*/*/* +%{_datadir}/icons/crystalsvg/*/*/* +%{_datadir}/icons/hicolor/*/*/* %{_mandir}/man*/* %{_libdir}/*.so %{_libdir}/*.la -%{_libdir}/*/*.so -%{_libdir}/*/*.la +%{tde_libdir}/*.so +%{tde_libdir}/*.la %Changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.2-7 +- Rebuilt for Fedora 17 +- Fix post and postun +- Adds patches from GIT + * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-6 - Fix HTML directory location diff --git a/redhat/applications/k3b/k3b-3.5.13-fix_Range_r_3-gcc47.patch b/redhat/applications/k3b/k3b-3.5.13-fix_Range_r_3-gcc47.patch new file mode 100644 index 000000000..3de442b61 --- /dev/null +++ b/redhat/applications/k3b/k3b-3.5.13-fix_Range_r_3-gcc47.patch @@ -0,0 +1,22 @@ +--- k3b/src/projects/k3baudioeditorwidget.cpp ++++ k3b/src/projects/k3baudioeditorwidget.cpp 2012-04-18 16:48:00.794902506 -0500 +@@ -663,15 +663,16 @@ + { + m_draggedRange = 0; + m_draggedMarker = 0; +- + bool end; +- if( Range* r = findRangeEdge( e->pos(), &end ) ) { ++ Range* r = findRangeEdge( e->pos(), &end ); ++ ++ if (r) { + m_draggedRange = r; + m_draggingRangeEnd = end; + setSelectedRange( r ); + } + else { +- Range* r = findRange( e->pos() ); ++ r = findRange( e->pos() ); + d->movedRange = r; + d->lastMovePosition = posToMsf( e->pos().x() ); + setSelectedRange( r ); diff --git a/redhat/applications/k3b/trinity-k3b-3.5.13.spec b/redhat/applications/k3b/trinity-k3b-3.5.13.spec index fd325935d..a0569181a 100644 --- a/redhat/applications/k3b/trinity-k3b-3.5.13.spec +++ b/redhat/applications/k3b/trinity-k3b-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 2 +%define release 3 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -49,6 +49,9 @@ Patch106: trinity-k3b-icons.patch # TDE 3.5.13 library directory changed Patch107: k3b-i18n-trinity.patch +# [k3b] Fix compilation with GCC 4.7 [Bug #958] +Patch108: k3b-3.5.13-fix_Range_r_3-gcc47.patch + BuildRequires: trinity-kdelibs-devel BuildRequires: desktop-file-utils BuildRequires: alsa-lib-devel @@ -120,15 +123,17 @@ Requires: %{name}-libs = %{version}-%{release} %patch4 -p1 -b .manualbufsize %patch106 -p1 -b .desktopfile %patch107 +%patch108 -p1 # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -213,7 +218,7 @@ update-desktop-database -q &> /dev/null %{_bindir}/k3b %{tde_libdir}/*.so %{tde_libdir}/*.la -%doc %{_docdir}/HTML/*/k3b/* +%doc %{tde_docdir}/HTML/en/k3b %files common %defattr(-,root,root,-) @@ -242,6 +247,10 @@ update-desktop-database -q &> /dev/null %changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 +- Rebuilt for Fedora 17 +- Fix compilation with GCC 4.7 [Bug #958] + * Sat Nov 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2 - Updates BuildRequires diff --git a/redhat/applications/k9copy/trinity-k9copy.spec b/redhat/applications/k9copy/trinity-k9copy.spec index c26b384f2..d56c14c08 100644 --- a/redhat/applications/k9copy/trinity-k9copy.spec +++ b/redhat/applications/k9copy/trinity-k9copy.spec @@ -55,14 +55,15 @@ This is the Trinity version # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" + %build export PATH="%{_bindir}:${PATH}" export LDFLAGS="-L%{_libdir} -I%{_includedir}" diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13-error_out_if_critical_osd_defines_not_set.patch b/redhat/applications/kaffeine/kaffeine-3.5.13-error_out_if_critical_osd_defines_not_set.patch new file mode 100644 index 000000000..9c01d1056 --- /dev/null +++ b/redhat/applications/kaffeine/kaffeine-3.5.13-error_out_if_critical_osd_defines_not_set.patch @@ -0,0 +1,25 @@ +commit 25b89439bbdcbc245b2a4125d2345afaa32fb952 +Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Date: 1326858742 -0600 + + Error out if critical OSD-related defines are not set + +diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp +index acc9937..68d47ac 100644 +--- a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp ++++ b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp +@@ -1513,6 +1513,14 @@ bool KXineWidget::playDvb() + return true; + } + ++#ifndef Q_BYTE_ORDER ++#error Q_BYTE_ORDER is not defined! ++#endif ++ ++#ifndef TQ_LITTLE_ENDIAN ++#error TQ_LITTLE_ENDIAN is not defined! ++#endif ++ + #if Q_BYTE_ORDER == TQ_LITTLE_ENDIAN + #define rgb2yuv(R,G,B) ((((((66*R+129*G+25*B+128)>>8)+16)<<8)|(((112*R-94*G-18*B+128)>>8)+128))<<8|(((-38*R-74*G+112*B+128)>>8)+128)) + #else diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13-fix_localization_files.patch b/redhat/applications/kaffeine/kaffeine-3.5.13-fix_localization_files.patch new file mode 100644 index 000000000..175998916 --- /dev/null +++ b/redhat/applications/kaffeine/kaffeine-3.5.13-fix_localization_files.patch @@ -0,0 +1,28 @@ +diff -aruN kaffeine-trinity-3.5.13.orig/admin/am_edit kaffeine-trinity-3.5.13/admin/am_edit +--- kaffeine-trinity-3.5.13.orig/admin/am_edit 2011-05-28 07:48:53.000000000 +0200 ++++ kaffeine-trinity-3.5.13/admin/am_edit 2012-02-26 19:05:36.000000000 +0100 +@@ -1643,6 +1643,10 @@ + + $target_adds{"install-data-am"} .= "install-nls "; + ++ if (!$lang) { ++ $tmp = "PACKAGE_BASE=`echo \"\$(PACKAGE)\" | sed \"s|-trinity-.*||\"`\n"; ++ appendLines ($tmp); ++ } + $tmp = "install-nls:\n"; + if ($lang) { + $tmp .= "\t\$(mkinstalldirs) \$(DESTDIR)\$(kde_locale)/$lang/LC_MESSAGES\n"; +@@ -1661,10 +1665,10 @@ + $tmp .= "\t elif test -f \$(srcdir)/\$\$base.gmo; then \$(INSTALL_DATA) \$(srcdir)/\$\$base.gmo \$(DESTDIR)\$(kde_locale)/$lang/LC_MESSAGES/\$\$base.mo ;\\\n"; + $tmp .= "\t fi ;\\\n"; + } else { +- $tmp .= "\t echo \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES/\$(PACKAGE).mo ;\\\n"; ++ $tmp .= "\t echo \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES/\$(PACKAGE_BASE).mo ;\\\n"; + $tmp .= "\t \$(mkinstalldirs) \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES ; \\\n"; +- $tmp .= "\t if test -f \$\$base.gmo; then \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES/\$(PACKAGE).mo ;\\\n"; +- $tmp .= "\t elif test -f \$(srcdir)/\$\$base.gmo; then \$(INSTALL_DATA) \$(srcdir)/\$\$base.gmo \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES/\$(PACKAGE).mo ;\\\n"; ++ $tmp .= "\t if test -f \$\$base.gmo; then \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES/\$(PACKAGE_BASE).mo ;\\\n"; ++ $tmp .= "\t elif test -f \$(srcdir)/\$\$base.gmo; then \$(INSTALL_DATA) \$(srcdir)/\$\$base.gmo \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES/\$(PACKAGE_BASE).mo ;\\\n"; + $tmp .= "\t fi ;\\\n"; + } + $tmp .= "\tdone\n\n"; diff --git a/redhat/applications/kaffeine/1331343133:fd68e4c4940afb4529b16e2c3e3d0f379ac7b161.diff b/redhat/applications/kaffeine/kaffeine-3.5.13-fix_slow_dvb_start.patch index 111f11b9c..71b71cc6e 100644 --- a/redhat/applications/kaffeine/1331343133:fd68e4c4940afb4529b16e2c3e3d0f379ac7b161.diff +++ b/redhat/applications/kaffeine/kaffeine-3.5.13-fix_slow_dvb_start.patch @@ -82,3 +82,16 @@ index 7d43ec0..2e81096 100644 -#endif /* ETQUALIZER_H */ +#endif /* EQUALIZER_H */ +diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp +index 68d47ac..ab87338 100644 +--- a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp ++++ b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp +@@ -3889,7 +3889,7 @@ void KXineWidget::getScreenshot(uchar*& rgb32BitData, int& videoWidth, int& vide + break; + default: + warningOut(TQString("Screenshot: Unknown aspect ratio: %1 - using 4:3").arg(ratio)); +- case XINE_VO_ASPECT_STQUARE: ++ case XINE_VO_ASPECT_SQUARE: + debugOut("Screenshot: got video aspect: 1:1"); + desired_ratio = image_ratio; + break; diff --git a/redhat/applications/kaffeine/1331957353:b480e3db3a01b75376fa6b83e5b01efe104ccaec.diff b/redhat/applications/kaffeine/kaffeine-3.5.13-fix_temporary_location.patch index 07d58235a..07d58235a 100644 --- a/redhat/applications/kaffeine/1331957353:b480e3db3a01b75376fa6b83e5b01efe104ccaec.diff +++ b/redhat/applications/kaffeine/kaffeine-3.5.13-fix_temporary_location.patch diff --git a/redhat/applications/kaffeine/1333649519:0e3d0ed603c6c8065fdcb77bc79b59a768fc6a5b.diff b/redhat/applications/kaffeine/kaffeine-3.5.13-fix_typos_branding_tqt.patch index fd5d6aea0..144e4bb1c 100644 --- a/redhat/applications/kaffeine/1333649519:0e3d0ed603c6c8065fdcb77bc79b59a768fc6a5b.diff +++ b/redhat/applications/kaffeine/kaffeine-3.5.13-fix_typos_branding_tqt.patch @@ -41,6 +41,49 @@ index 2b1d2e7..57b9254 100644 * @return 0 on success, -1 on failure. */ typedef int (*en50221_app_auth_request_callback) (void *arg, +diff --git a/kaffeine/src/input/dvb/lib/libdvben50221/en50221_app_teletext.h b/kaffeine/src/input/dvb/lib/libdvben50221/en50221_app_teletext.h +index b5b85f1..ce6ef42 100644 +--- a/kaffeine/src/input/dvb/lib/libdvben50221/en50221_app_teletext.h ++++ b/kaffeine/src/input/dvb/lib/libdvben50221/en50221_app_teletext.h +@@ -42,7 +42,7 @@ extern "C" { + * @param slot_id Slot id concerned. + * @param session_number Session number concerned. + * @param teletext_data Data for the request. +- * @param teletext_data_lenghth Number of bytes. ++ * @param teletext_data_length Number of bytes. + * @return 0 on success, -1 on failure. + */ + typedef int (*en50221_app_teletext_callback) (void *arg, +diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp +index 2294956..6679b97 100644 +--- a/kaffeine/src/kaffeine.cpp ++++ b/kaffeine/src/kaffeine.cpp +@@ -238,13 +238,13 @@ Kaffeine::Kaffeine() : DCOPObject("KaffeineIface"), + } + #endif + +- /** KWin are you there? **/ ++ /** TWin are you there? **/ + + m_haveKWin = KApplication::dcopClient()->isApplicationRegistered("twin"); + if (m_haveKWin) +- kdDebug() << "Window manager: KWin found" << endl; ++ kdDebug() << "Window manager: TWin found" << endl; + else +- kdDebug() << "Window manager: not KWin - using save fullscreen mode" << endl; ++ kdDebug() << "Window manager: not TWin - using save fullscreen mode" << endl; + + connect(&m_screensaverTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotFakeKeyEvent())); + m_screensaverTimer.start( 55000 ); +@@ -1261,7 +1261,7 @@ void Kaffeine::mouseDoubleClickEvent(TQMouseEvent*) + void Kaffeine::mousePressEvent(TQMouseEvent* mev) + { + kdDebug() << "Kaffeine: Mouse press event" << endl; +- if ( m_minimal->isChecked() && !m_fullscreen->isChecked() && (mev->button() == Qt::MidButton) ) { ++ if ( m_minimal->isChecked() && !m_fullscreen->isChecked() && (mev->button() == MidButton) ) { + if (topDock()->isVisible()) { + hideToolbars(true); + //menuBar()->hide; diff --git a/kaffeine/src/kmultitabbar.cpp b/kaffeine/src/kmultitabbar.cpp index 8d85e01..e8148a7 100644 --- a/kaffeine/src/kmultitabbar.cpp @@ -83,11 +126,11 @@ index 8d85e01..e8148a7 100644 m_btnTabSep->setFixedHeight(4); diff --git a/kaffeine/src/kmultitabbar.h b/kaffeine/src/kmultitabbar.h index 72fa884..2932cc2 100644 ---- kaffeine/kaffeine/src/kmultitabbar.h.orig 2011-08-17 23:23:42.000000000 +0200 -+++ kaffeine/kaffeine/src/kmultitabbar.h 2012-04-25 23:51:09.339505891 +0200 -@@ -55,16 +55,16 @@ +--- a/kaffeine/src/kmultitabbar.h ++++ b/kaffeine/src/kmultitabbar.h +@@ -55,16 +55,16 @@ class /*KUTILS_EXPORT*/ KMultiTabBar: public TQWidget Q_OBJECT - TQ_OBJECT + public: - enum KMultiTabBarMode{Horizontal,Vertical}; + enum KMultiTabBarMode{Horizontal, Vertical}; @@ -111,28 +154,28 @@ index ccb56f3..b7e88c7 100644 +++ b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp @@ -54,7 +54,7 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin label = new TQLabel(i18n("Prefered audio driver"), frame); - tqlayout->addWidget(label, 1, 0); - tqlayout->addWidget(m_audioDriverBox, 1, 1); -- tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); -+ tqlayout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1); + layout->addWidget(label, 1, 0); + layout->addWidget(m_audioDriverBox, 1, 1); +- layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); ++ layout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1); //Video Page frame = addPage(i18n("Video"), i18n("Video Options"), KGlobal::iconLoader()->loadIcon("video", KIcon::Panel, @@ -67,7 +67,7 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin label = new TQLabel(i18n("Prefered video driver")+ "*", frame); - tqlayout->addWidget(label, 1, 0); - tqlayout->addWidget(m_videoDriverBox, 1, 1); -- tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); -+ tqlayout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1); - tqlayout->addWidget(new TQLabel(TQString("<small>") + i18n("* Restart required!") + "</small>", frame), 10, 1); + layout->addWidget(label, 1, 0); + layout->addWidget(m_videoDriverBox, 1, 1); +- layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); ++ layout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1); + layout->addWidget(new TQLabel(TQString("<small>") + i18n("* Restart required!") + "</small>", frame), 10, 1); //Media page @@ -80,7 +80,7 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin label = new TQLabel(i18n("CD, VCD, DVD drive"), frame); - tqlayout->addWidget(label, 1, 0); - tqlayout->addWidget(m_driveEdit, 1, 1); -- tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); -+ tqlayout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1); + layout->addWidget(label, 1, 0); + layout->addWidget(m_driveEdit, 1, 1); +- layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); ++ layout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1); } GStreamerConfig::~GStreamerConfig() @@ -214,10 +257,10 @@ index 98ff969..9fc18e6 100644 if (TQApplication::reverseLayout()) diff --git a/kaffeine/src/player-parts/xine-part/xineconfig.cpp b/kaffeine/src/player-parts/xine-part/xineconfig.cpp index 6d6a2d4..1281911 100644 ---- kaffeine/kaffeine/src/player-parts/xine-part/xineconfig.cpp.orig 2011-08-17 23:23:40.000000000 +0200 -+++ kaffeine/kaffeine/src/player-parts/xine-part/xineconfig.cpp 2012-04-25 23:53:25.094399051 +0200 -@@ -135,7 +135,7 @@ - description->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter ); +--- a/kaffeine/src/player-parts/xine-part/xineconfig.cpp ++++ b/kaffeine/src/player-parts/xine-part/xineconfig.cpp +@@ -135,7 +135,7 @@ XineConfigEntry::XineConfigEntry(TQWidget* parent, TQGridLayout* grid, int row, + description->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter ); grid->addWidget(description, row, 1); - KSeparator* separator = new KSeparator(Qt::Horizontal, parent); diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13-remove_additional_tq_conversions.patch b/redhat/applications/kaffeine/kaffeine-3.5.13-remove_additional_tq_conversions.patch new file mode 100644 index 000000000..ace85881f --- /dev/null +++ b/redhat/applications/kaffeine/kaffeine-3.5.13-remove_additional_tq_conversions.patch @@ -0,0 +1,1403 @@ +commit 701a124908ec0072b12cd3884589a86431f36080 +Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Date: 1324316159 -0600 + + Remove additional unneeded tq method conversions + +diff --git a/kaffeine/src/input/audiobrowser/googlefetcher.cpp b/kaffeine/src/input/audiobrowser/googlefetcher.cpp +index c74317d..0e76b88 100644 +--- a/kaffeine/src/input/audiobrowser/googlefetcher.cpp ++++ b/kaffeine/src/input/audiobrowser/googlefetcher.cpp +@@ -108,7 +108,7 @@ void GoogleFetcher::slotLoadImageURLs(GoogleFetcher::ImageSize size) + + kdDebug() << "Performing Google Search: " << url << endl; + +- search.load(url.url()+TQString("&start=%1&sa=N").tqarg(galleryPage*20) ); ++ search.load(url.url()+TQString("&start=%1&sa=N").arg(galleryPage*20) ); + + TQString text = search.toString().string(); + +diff --git a/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp b/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp +index 5bb169e..ccfea35 100644 +--- a/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp ++++ b/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp +@@ -87,9 +87,9 @@ GoogleFetcherDialog::~GoogleFetcherDialog() + void GoogleFetcherDialog::setLayout() + { + setCaption(TQString("%1 - %2 (%3)") +- .tqarg(m_artist) +- .tqarg(m_album) +- .tqarg(m_imageList.size())); ++ .arg(m_artist) ++ .arg(m_album) ++ .arg(m_imageList.size())); + + m_iconWidget->clear(); + for(uint i = 0; i < m_imageList.size(); i++) +@@ -237,7 +237,7 @@ CoverIconViewItem::~CoverIconViewItem() + void CoverIconViewItem::imageData(KIO::Job *, const TQByteArray &data) + { + int currentSize = m_buffer.size(); +- m_buffer.tqresize(currentSize + data.size(), TQGArray::SpeedOptim); ++ m_buffer.resize(currentSize + data.size(), TQGArray::SpeedOptim); + memcpy(&(m_buffer.data()[currentSize]), data.data(), data.size()); + } + +diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp +index 3735b61..e67603e 100644 +--- a/kaffeine/src/input/audiobrowser/playlist.cpp ++++ b/kaffeine/src/input/audiobrowser/playlist.cpp +@@ -1774,14 +1774,14 @@ void PlayList::updateStatus() + TQValueList<MRL>::ConstIterator end(m_queue.end()); + for (TQValueList<MRL>::ConstIterator it = m_queue.begin(); it != end; ++it) + total = total.addSecs(TQTime().secsTo((*it).length())); +- status = i18n("Queue: %1 Entries, Playtime: %2").tqarg(m_queue.count()).tqarg(total.toString("h:mm:ss")); ++ status = i18n("Queue: %1 Entries, Playtime: %2").arg(m_queue.count()).arg(total.toString("h:mm:ss")); + } + else + { +- //status = i18n("Entries: %1, Playtime: %2 (Total: %3, %4)").tqarg(TQString::number(m_countVisible)).tqarg(msToTimeString(m_playTimeVisible)).tqarg(TQString::number(m_list->childCount())).tqarg(msToTimeString(m_playTime)); ++ //status = i18n("Entries: %1, Playtime: %2 (Total: %3, %4)").arg(TQString::number(m_countVisible)).arg(msToTimeString(m_playTimeVisible)).arg(TQString::number(m_list->childCount())).arg(msToTimeString(m_playTime)); + + +- status = i18n("Entries: %1, Playtime: %2").tqarg(TQString::number(m_countVisible)).tqarg(msToTimeString(m_playTimeVisible)); ++ status = i18n("Entries: %1, Playtime: %2").arg(TQString::number(m_countVisible)).arg(msToTimeString(m_playTimeVisible)); + } + emit statusBarMessage(status); + } +@@ -1886,7 +1886,7 @@ void PlayList::saveCurrentPlaylist() + + void PlayList::removeCurrentPlaylist() + { +- int code = KMessageBox::warningContinueCancel(0, i18n("Remove '%1' from list and from disk?").tqarg(m_playlistSelector->text(m_currentPlaylist)),TQString(),KStdGuiItem::del()); ++ int code = KMessageBox::warningContinueCancel(0, i18n("Remove '%1' from list and from disk?").arg(m_playlistSelector->text(m_currentPlaylist)),TQString(),KStdGuiItem::del()); + if (code == KMessageBox::Continue) + { + TQString pl = m_playlistDirectory + m_playlistSelector->text(m_currentPlaylist) + ".kaffeine"; +diff --git a/kaffeine/src/input/disc/cddb.cpp b/kaffeine/src/input/disc/cddb.cpp +index 9581651..231e008 100644 +--- a/kaffeine/src/input/disc/cddb.cpp ++++ b/kaffeine/src/input/disc/cddb.cpp +@@ -302,7 +302,7 @@ bool CDDB::parse_read_resp(TQTextStream *stream, TQTextStream *write_stream) + for (int i = 0; i < m_tracks; i++) + { + if (m_names[i].isEmpty()) +- m_names[i] += i18n("Track %1").tqarg(i); ++ m_names[i] += i18n("Track %1").arg(i); + m_names[i].replace(TQRegExp("/"), "%2f"); + kdDebug(7101) << "CDDB: found Track " << i+1 << ": `" << m_names[i] + << "'" << endl; +@@ -328,7 +328,7 @@ bool CDDB::searchLocal(unsigned int id, TQFile *ret_file) + { + TQDir dir; + TQString filename; +- filename = TQString("%1").tqarg(id, 0, 16).rightJustify(8, '0'); ++ filename = TQString("%1").arg(id, 0, 16).rightJustify(8, '0'); + TQStringList::ConstIterator it; + for (it = cddb_dirs.begin(); it != cddb_dirs.end(); ++it) + { +diff --git a/kaffeine/src/input/disc/disc.cpp b/kaffeine/src/input/disc/disc.cpp +index e392dca..31bba0c 100644 +--- a/kaffeine/src/input/disc/disc.cpp ++++ b/kaffeine/src/input/disc/disc.cpp +@@ -370,7 +370,7 @@ void Disc::trackSelected( TQListViewItem *it ) + if ( !it ) + return; + +- MRL mrl( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) ); ++ MRL mrl( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) ); + mrl.setTitle( it->text(1) ); + mrl.setArtist( artistLab->text() ); + mrl.setAlbum( albumLab->text() ); +@@ -465,7 +465,7 @@ void Disc::startCD( const TQString &device, bool rip ) + for ( i=0; i<para->getTracks(); i++ ) { + it = new KListViewItem( list, TQString().sprintf("%02d", i+1), cddb->track( i ), para->trackTime(i) ); + if ( i==0 ) { +- mrl.setURL( TQString("cdda://%1/1").tqarg( currentDevice ) ); ++ mrl.setURL( TQString("cdda://%1/1").arg( currentDevice ) ); + mrl.setTitle( cddb->track(i) ); + mrl.setArtist( artistLab->text() ); + mrl.setAlbum( albumLab->text() ); +@@ -481,7 +481,7 @@ void Disc::startCD( const TQString &device, bool rip ) + for ( i=0; i<para->getTracks(); i++ ) { + it = new KListViewItem( list, TQString().sprintf("%02d", i+1), cddb->track( i ), para->trackTime(i) ); + if ( i==0 ) { +- mrl.setURL( TQString("cdda://%1/1").tqarg( currentDevice ) ); ++ mrl.setURL( TQString("cdda://%1/1").arg( currentDevice ) ); + mrl.setTitle( cddb->track(i) ); + mrl.setArtist( artistLab->text() ); + mrl.setAlbum( albumLab->text() ); +@@ -495,7 +495,7 @@ void Disc::startCD( const TQString &device, bool rip ) + for ( i=0; i<para->getTracks(); i++ ) { + it = new KListViewItem( list, TQString().sprintf("%02d", i+1), i18n("Track")+TQString().sprintf("%02d", i+1), para->trackTime(i) ); + if ( i==0 ) { +- mrl.setURL( TQString("cdda://%1/1").tqarg( currentDevice ) ); ++ mrl.setURL( TQString("cdda://%1/1").arg( currentDevice ) ); + mrl.setTitle( i18n("Track")+TQString().sprintf("%02d", i+1) ); + mrl.setArtist( artistLab->text() ); + mrl.setAlbum( albumLab->text() ); +@@ -531,7 +531,7 @@ void Disc::startDVD( const TQString &device ) + bool ok=false; + + if ( !device.isEmpty() ) +- mrl.setURL( TQString("dvd://%1").tqarg(device) ); ++ mrl.setURL( TQString("dvd://%1").arg(device) ); + else { + DCOPRef mediamanager("kded","mediamanager"); + DCOPReply reply = mediamanager.call("fullList()"); +@@ -555,12 +555,12 @@ void Disc::startDVD( const TQString &device ) + TQString choice = KInputDialog::getItem( i18n("DVD Video"), i18n("Several DVD Video found. Choose one:"), + devList, 0, false, &ok ); + if ( ok ) +- mrl.setURL( TQString("dvd://%1").tqarg(choice) ); ++ mrl.setURL( TQString("dvd://%1").arg(choice) ); + else + return; + } + else if ( devList.count()==1 ) +- mrl.setURL( TQString("dvd://%1").tqarg(devList[0]) ); ++ mrl.setURL( TQString("dvd://%1").arg(devList[0]) ); + else { + //KMessageBox::information( 0, i18n("No DVD Video found."), i18n("Warning") ); + //return; +@@ -591,7 +591,7 @@ void Disc::startVCD( const TQString &device ) + bool ok=false; + + if ( !device.isEmpty() ) +- mrl.setURL( TQString("vcd://%1").tqarg(device) ); ++ mrl.setURL( TQString("vcd://%1").arg(device) ); + else { + DCOPRef mediamanager("kded","mediamanager"); + DCOPReply reply = mediamanager.call("fullList()"); +@@ -609,12 +609,12 @@ void Disc::startVCD( const TQString &device ) + TQString choice = KInputDialog::getItem( i18n("VCD-SVCD"), i18n("Several (S)VCD found. Choose one:"), + devList, 0, false, &ok ); + if ( ok ) +- mrl.setURL( TQString("vcd://%1").tqarg(choice) ); ++ mrl.setURL( TQString("vcd://%1").arg(choice) ); + else + return; + } + else if ( devList.count()==1 ) +- mrl.setURL( TQString("vcd://%1").tqarg(devList[0]) ); ++ mrl.setURL( TQString("vcd://%1").arg(devList[0]) ); + else { + //KMessageBox::information( 0, i18n("No (S)VCD found."), i18n("Warning") ); + //return; +@@ -649,7 +649,7 @@ bool Disc::currentTrack( MRL &mrl ) + return false; + while ( it!=0 ) { + if ( it->text(0).toInt()==trackCurrent ) { +- mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) ); ++ mrl.setURL( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) ); + mrl.setTitle( it->text(1) ); + mrl.setArtist( artistLab->text() ); + mrl.setAlbum( albumLab->text() ); +@@ -681,7 +681,7 @@ bool Disc::nextTrack( MRL &mrl ) + return false; + while ( it!=0 ) { + if ( it->text(0).toInt()==trackCurrent+1 ) { +- mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) ); ++ mrl.setURL( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) ); + mrl.setTitle( it->text(1) ); + mrl.setArtist( artistLab->text() ); + mrl.setAlbum( albumLab->text() ); +@@ -695,7 +695,7 @@ bool Disc::nextTrack( MRL &mrl ) + } + + it = list->firstChild(); +- mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) ); ++ mrl.setURL( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) ); + mrl.setTitle( it->text(1) ); + mrl.setArtist( artistLab->text() ); + mrl.setAlbum( albumLab->text() ); +@@ -718,7 +718,7 @@ bool Disc::previousTrack( MRL &mrl ) + return false; + while ( it!=0 ) { + if ( it->text(0).toInt()==trackCurrent-1 ) { +- mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) ); ++ mrl.setURL( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) ); + mrl.setTitle( it->text(1) ); + mrl.setArtist( artistLab->text() ); + mrl.setAlbum( albumLab->text() ); +@@ -746,7 +746,7 @@ bool Disc::trackNumber( int number, MRL &mrl ) + return false; + while ( it!=0 ) { + if ( it->text(0).toInt()==number ) { +- mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) ); ++ mrl.setURL( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) ); + mrl.setTitle( it->text(1) ); + mrl.setArtist( artistLab->text() ); + mrl.setAlbum( albumLab->text() ); +diff --git a/kaffeine/src/input/disc/paranoia.cpp b/kaffeine/src/input/disc/paranoia.cpp +index 03f39fa..36b052a 100644 +--- a/kaffeine/src/input/disc/paranoia.cpp ++++ b/kaffeine/src/input/disc/paranoia.cpp +@@ -288,14 +288,14 @@ bool Paranoia::loadEncoder( TQWidget *parent ) + + KService::Ptr service = KService::serviceByDesktopName( encoderDesktop ); + if (!service) { +- KMessageBox::error( parent, i18n("Loading of encoder '%1' failed.").tqarg(encoderDesktop) ); ++ KMessageBox::error( parent, i18n("Loading of encoder '%1' failed.").arg(encoderDesktop) ); + return false; + } + + if ( service->serviceTypes().contains("KaffeineAudioEncoder") ) { + currentEncoder = KParts::ComponentFactory::createPartInstanceFromService<KaffeineAudioEncoder>(service, 0, service->name().ascii(), 0, 0, 0, &error); + if (error > 0) { +- KMessageBox::error( parent, i18n("Loading of encoder '%1' failed.").tqarg(encoderDesktop) ); ++ KMessageBox::error( parent, i18n("Loading of encoder '%1' failed.").arg(encoderDesktop) ); + return false; + } + else +diff --git a/kaffeine/src/input/dvb/dvbcam.cpp b/kaffeine/src/input/dvb/dvbcam.cpp +index b430b38..41e9895 100644 +--- a/kaffeine/src/input/dvb/dvbcam.cpp ++++ b/kaffeine/src/input/dvb/dvbcam.cpp +@@ -79,7 +79,7 @@ int DvbCam::probe( int adapter, int ca_device ) + int fdCa; + ca_caps_t cap; + ca_slot_info_t info; +- TQString s = TQString("/dev/dvb/adapter%1/ca%2").tqarg( adapter ).tqarg( ca_device ); ++ TQString s = TQString("/dev/dvb/adapter%1/ca%2").arg( adapter ).arg( ca_device ); + + if ( (fdCa = open( s.ascii(), O_RDWR )) < 0) { + fprintf(stderr, "DvbCam::probe(): %s:", s.ascii()); +@@ -413,11 +413,11 @@ int DvbCam::aiCallback(void *arg, uint8_t slot_id, uint16_t session_number, uint + (void)session_number; + + fprintf(stderr, "CAM Application type: %02x\n", application_type); +- std->dvbcam->setAppType( TQString("0x%1").tqarg(application_type, 0, 16 ) ); ++ std->dvbcam->setAppType( TQString("0x%1").arg(application_type, 0, 16 ) ); + fprintf(stderr, "CAM Application manufacturer: %04x\n", application_manufacturer); +- std->dvbcam->setAppManu( TQString("0x%1").tqarg(application_manufacturer, 0, 16 ) ); ++ std->dvbcam->setAppManu( TQString("0x%1").arg(application_manufacturer, 0, 16 ) ); + fprintf(stderr, "CAM Manufacturer code: %04x\n", manufacturer_code); +- std->dvbcam->setManuCode( TQString("0x%1").tqarg(manufacturer_code, 0, 16 ) ); ++ std->dvbcam->setManuCode( TQString("0x%1").arg(manufacturer_code, 0, 16 ) ); + fprintf(stderr, "CAM Menu string: %.*s\n", menu_string_length, menu_string); + TQString s = (const char*)menu_string; + s.truncate( menu_string_length ); +@@ -531,7 +531,7 @@ int DvbCam::mmi_menu_callback(void *arg, uint8_t slot_id, uint16_t session_numbe + fprintf(stderr, "%i. %.*s\n", i+1, items[i].text_length, items[i].text); + s = (const char*)items[i].text; + s.truncate( items[i].text_length ); +- std->menuList.append( TQString("%1. %2").tqarg(i+1).tqarg(s) ); ++ std->menuList.append( TQString("%1. %2").arg(i+1).arg(s) ); + + } + +diff --git a/kaffeine/src/input/dvb/dvbconfig.cpp b/kaffeine/src/input/dvb/dvbconfig.cpp +index c920090..5f9e228 100644 +--- a/kaffeine/src/input/dvb/dvbconfig.cpp ++++ b/kaffeine/src/input/dvb/dvbconfig.cpp +@@ -187,10 +187,10 @@ bool DVBconfig::haveDvbDevice() + d.setPath( "/dev/dvb/"+list[i]+"/" ); + flist = d.entryList( "frontend*", TQDir::System, TQDir::Name ); + for ( j=0; j<(int)flist.count(); j++ ) { +- fdFrontend = open( TQString("/dev/dvb/%1/%2").tqarg( list[i] ).tqarg( flist[j] ).ascii(), O_RDWR); ++ fdFrontend = open( TQString("/dev/dvb/%1/%2").arg( list[i] ).arg( flist[j] ).ascii(), O_RDWR); + if ( fdFrontend>0 ) { + if ( (res = ioctl( fdFrontend, FE_GET_INFO, &info ) < 0) ) +- perror( TQString("/dev/dvb/%1/%2 FE_GET_INFO: ").tqarg( list[i] ).tqarg( flist[j] ).ascii() ); ++ perror( TQString("/dev/dvb/%1/%2 FE_GET_INFO: ").arg( list[i] ).arg( flist[j] ).ascii() ); + else { + close( fdFrontend ); + return true; +@@ -229,7 +229,7 @@ void DVBconfig::startup() + if ( !probeMfe && t!="frontend0" ) + continue; + t1 = TQTime::currentTime(); +- fdFrontend = open( TQString("/dev/dvb/%1/%2").tqarg( s ).tqarg( t ).ascii(), O_RDWR); ++ fdFrontend = open( TQString("/dev/dvb/%1/%2").arg( s ).arg( t ).ascii(), O_RDWR); + if ( fdFrontend>0 ) { + if ( !(res = ioctl( fdFrontend, FE_GET_INFO, &info ) < 0) ) { + if ( (info.type==FE_OFDM) +@@ -247,7 +247,7 @@ void DVBconfig::startup() + close( fdFrontend ); + } + else { +- perror( TQString("/dev/dvb/%1/%2 %3/%4").tqarg( s ).tqarg( t ).tqarg( errno ).tqarg( -EBUSY ).ascii() ); ++ perror( TQString("/dev/dvb/%1/%2 %3/%4").arg( s ).arg( t ).arg( errno ).arg( -EBUSY ).ascii() ); + } + } + } +@@ -450,30 +450,30 @@ void DVBconfig::readConfig() + shiftDir+= "/"; + filenameFormat = config->readEntry( "filenameFormat", "%name" ); + for ( i=0; i<(int)devList.count(); i++ ) { +- devList.at(i)->source = config->readEntry( TQString("DVB%1").tqarg(i), "" ); +- devList.at(i)->tuningTimeout = config->readNumEntry( TQString("DVB%1_TIMEOUT").tqarg(i), 1500 ); +- devList.at(i)->camMaxService = config->readNumEntry( TQString("DVB%1_CAM_MAX").tqarg(i), 1 ); +- devList.at(i)->priority = config->readNumEntry( TQString("DVB%1_PRIORITY").tqarg(i), 10 ); ++ devList.at(i)->source = config->readEntry( TQString("DVB%1").arg(i), "" ); ++ devList.at(i)->tuningTimeout = config->readNumEntry( TQString("DVB%1_TIMEOUT").arg(i), 1500 ); ++ devList.at(i)->camMaxService = config->readNumEntry( TQString("DVB%1_CAM_MAX").arg(i), 1 ); ++ devList.at(i)->priority = config->readNumEntry( TQString("DVB%1_PRIORITY").arg(i), 10 ); + if ( devList.at(i)->type!=FE_QPSK ) + continue; +- devList.at(i)->numLnb = config->readNumEntry( TQString("DVB%1_NLNB").tqarg(i), 1 ); ++ devList.at(i)->numLnb = config->readNumEntry( TQString("DVB%1_NLNB").arg(i), 1 ); + for ( j=0; j<devList.at(i)->numLnb; j++ ) { +- devList.at(i)->lnb[j].switchFreq = config->readNumEntry( TQString("DVB%1_LNB%2_switch").tqarg(i).tqarg(j), 11700 ); +- devList.at(i)->lnb[j].loFreq = config->readNumEntry( TQString("DVB%1_LNB%2_lo").tqarg(i).tqarg(j), 9750 ); +- devList.at(i)->lnb[j].hiFreq = config->readNumEntry( TQString("DVB%1_LNB%2_hi").tqarg(i).tqarg(j), 10600 ); +- devList.at(i)->lnb[j].rotorType = config->readNumEntry( TQString("DVB%1_LNB%2_rotor").tqarg(i).tqarg(j), 0 ); +- devList.at(i)->lnb[j].source = config->readListEntry( TQString("DVB%1_LNB%2_source").tqarg(i).tqarg(j) ); +- devList.at(i)->lnb[j].position = config->readIntListEntry( TQString("DVB%1_LNB%2_position").tqarg(i).tqarg(j) ); +- devList.at(i)->lnb[j].speed13v = config->readDoubleNumEntry( TQString("DVB%1_LNB%2_speed13v").tqarg(i).tqarg(j), 2.5 ); +- devList.at(i)->lnb[j].speed18v = config->readDoubleNumEntry( TQString("DVB%1_LNB%2_speed18v").tqarg(i).tqarg(j), 1.5 ); ++ devList.at(i)->lnb[j].switchFreq = config->readNumEntry( TQString("DVB%1_LNB%2_switch").arg(i).arg(j), 11700 ); ++ devList.at(i)->lnb[j].loFreq = config->readNumEntry( TQString("DVB%1_LNB%2_lo").arg(i).arg(j), 9750 ); ++ devList.at(i)->lnb[j].hiFreq = config->readNumEntry( TQString("DVB%1_LNB%2_hi").arg(i).arg(j), 10600 ); ++ devList.at(i)->lnb[j].rotorType = config->readNumEntry( TQString("DVB%1_LNB%2_rotor").arg(i).arg(j), 0 ); ++ devList.at(i)->lnb[j].source = config->readListEntry( TQString("DVB%1_LNB%2_source").arg(i).arg(j) ); ++ devList.at(i)->lnb[j].position = config->readIntListEntry( TQString("DVB%1_LNB%2_position").arg(i).arg(j) ); ++ devList.at(i)->lnb[j].speed13v = config->readDoubleNumEntry( TQString("DVB%1_LNB%2_speed13v").arg(i).arg(j), 2.5 ); ++ devList.at(i)->lnb[j].speed18v = config->readDoubleNumEntry( TQString("DVB%1_LNB%2_speed18v").arg(i).arg(j), 1.5 ); + } +- devList.at(i)->secMini = config->readNumEntry( TQString("DVB%1_SEC_MINI").tqarg(i), 0 ); +- devList.at(i)->secTwice = config->readNumEntry( TQString("DVB%1_SEC_TWICE").tqarg(i), 0 ); +- devList.at(i)->doS2 = config->readNumEntry( TQString("DVB%1_DOS2").tqarg(i), 0 ); ++ devList.at(i)->secMini = config->readNumEntry( TQString("DVB%1_SEC_MINI").arg(i), 0 ); ++ devList.at(i)->secTwice = config->readNumEntry( TQString("DVB%1_SEC_TWICE").arg(i), 0 ); ++ devList.at(i)->doS2 = config->readNumEntry( TQString("DVB%1_DOS2").arg(i), 0 ); + } + j = config->readNumEntry( "NumCategories", 0 ); + for ( i=0; i<j; i++ ) +- categories.append( new Category( config->readEntry( TQString("CategoryName%1").tqarg(i), "" ), config->readEntry( TQString("CategoryIcon%1").tqarg(i), "kaffeine" ) ) ); ++ categories.append( new Category( config->readEntry( TQString("CategoryName%1").arg(i), "" ), config->readEntry( TQString("CategoryIcon%1").arg(i), "kaffeine" ) ) ); + allIcon = config->readEntry( "AllIcon", "kaffeine" ); + tvIcon = config->readEntry( "TvIcon", "kdvbtv" ); + radioIcon = config->readEntry( "RadioIcon", "kdvbra" ); +@@ -512,31 +512,31 @@ void DVBconfig::saveConfig() + config->writeEntry( "SenderPort", senderPort ); + config->writeEntry( "ProbeMFE", probeMfe ); + for ( i=0; i<(int)devList.count(); i++ ) { +- config->writeEntry( TQString("DVB%1").tqarg(i), devList.at(i)->source ); +- config->writeEntry( TQString("DVB%1_TIMEOUT").tqarg(i), devList.at(i)->tuningTimeout ); +- config->writeEntry( TQString("DVB%1_PRIORITY").tqarg(i), devList.at(i)->priority ); +- config->writeEntry( TQString("DVB%1_CAM_MAX").tqarg(i), devList.at(i)->camMaxService ); ++ config->writeEntry( TQString("DVB%1").arg(i), devList.at(i)->source ); ++ config->writeEntry( TQString("DVB%1_TIMEOUT").arg(i), devList.at(i)->tuningTimeout ); ++ config->writeEntry( TQString("DVB%1_PRIORITY").arg(i), devList.at(i)->priority ); ++ config->writeEntry( TQString("DVB%1_CAM_MAX").arg(i), devList.at(i)->camMaxService ); + if ( devList.at(i)->type!=FE_QPSK ) + continue; +- config->writeEntry( TQString("DVB%1_NLNB").tqarg(i), devList.at(i)->numLnb ); ++ config->writeEntry( TQString("DVB%1_NLNB").arg(i), devList.at(i)->numLnb ); + for ( j=0; j<devList.at(i)->numLnb; j++ ) { +- config->writeEntry( TQString("DVB%1_LNB%2_switch").tqarg(i).tqarg(j), devList.at(i)->lnb[j].switchFreq ); +- config->writeEntry( TQString("DVB%1_LNB%2_lo").tqarg(i).tqarg(j), devList.at(i)->lnb[j].loFreq ); +- config->writeEntry( TQString("DVB%1_LNB%2_hi").tqarg(i).tqarg(j), devList.at(i)->lnb[j].hiFreq ); +- config->writeEntry( TQString("DVB%1_LNB%2_rotor").tqarg(i).tqarg(j), devList.at(i)->lnb[j].rotorType ); +- config->writeEntry( TQString("DVB%1_LNB%2_source").tqarg(i).tqarg(j), devList.at(i)->lnb[j].source ); +- config->writeEntry( TQString("DVB%1_LNB%2_position").tqarg(i).tqarg(j), devList.at(i)->lnb[j].position ); +- config->writeEntry( TQString("DVB%1_LNB%2_speed13v").tqarg(i).tqarg(j), devList.at(i)->lnb[j].speed13v ); +- config->writeEntry( TQString("DVB%1_LNB%2_speed18v").tqarg(i).tqarg(j), devList.at(i)->lnb[j].speed18v ); ++ config->writeEntry( TQString("DVB%1_LNB%2_switch").arg(i).arg(j), devList.at(i)->lnb[j].switchFreq ); ++ config->writeEntry( TQString("DVB%1_LNB%2_lo").arg(i).arg(j), devList.at(i)->lnb[j].loFreq ); ++ config->writeEntry( TQString("DVB%1_LNB%2_hi").arg(i).arg(j), devList.at(i)->lnb[j].hiFreq ); ++ config->writeEntry( TQString("DVB%1_LNB%2_rotor").arg(i).arg(j), devList.at(i)->lnb[j].rotorType ); ++ config->writeEntry( TQString("DVB%1_LNB%2_source").arg(i).arg(j), devList.at(i)->lnb[j].source ); ++ config->writeEntry( TQString("DVB%1_LNB%2_position").arg(i).arg(j), devList.at(i)->lnb[j].position ); ++ config->writeEntry( TQString("DVB%1_LNB%2_speed13v").arg(i).arg(j), devList.at(i)->lnb[j].speed13v ); ++ config->writeEntry( TQString("DVB%1_LNB%2_speed18v").arg(i).arg(j), devList.at(i)->lnb[j].speed18v ); + } +- config->writeEntry( TQString("DVB%1_SEC_MINI").tqarg(i), devList.at(i)->secMini ); +- config->writeEntry( TQString("DVB%1_SEC_TWICE").tqarg(i), devList.at(i)->secTwice ); +- config->writeEntry( TQString("DVB%1_DOS2").tqarg(i), devList.at(i)->doS2 ); ++ config->writeEntry( TQString("DVB%1_SEC_MINI").arg(i), devList.at(i)->secMini ); ++ config->writeEntry( TQString("DVB%1_SEC_TWICE").arg(i), devList.at(i)->secTwice ); ++ config->writeEntry( TQString("DVB%1_DOS2").arg(i), devList.at(i)->doS2 ); + } + config->writeEntry( "NumCategories", categories.count() ); + for ( i=0; i<(int)categories.count(); i++ ) { +- config->writeEntry( TQString("CategoryName%1").tqarg(i), categories.at(i)->name ); +- config->writeEntry( TQString("CategoryIcon%1").tqarg(i), categories.at(i)->icon ); ++ config->writeEntry( TQString("CategoryName%1").arg(i), categories.at(i)->name ); ++ config->writeEntry( TQString("CategoryIcon%1").arg(i), categories.at(i)->icon ); + } + config->writeEntry( "AllIcon", allIcon ); + config->writeEntry( "TvIcon", tvIcon ); +@@ -589,7 +589,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent + timeoutSpin.setAutoDelete( true ); + + for ( i=0; i<(int)dvbConfig->devList.count(); i++ ) { +- page = addPage( i18n("DVB Device")+" "+TQString("%1:%2").tqarg(dvbConfig->devList.at(i)->adapter).tqarg(dvbConfig->devList.at(i)->tuner), i18n("Device Settings"), ++ page = addPage( i18n("DVB Device")+" "+TQString("%1:%2").arg(dvbConfig->devList.at(i)->adapter).arg(dvbConfig->devList.at(i)->tuner), i18n("Device Settings"), + KGlobal::instance()->iconLoader()->loadIcon( "hwinfo", KIcon::NoGroup, KIcon::SizeMedium ) ); + vb = new TQVBoxLayout( page, 6, 6 ); + gb = new TQGroupBox( "", page ); +diff --git a/kaffeine/src/input/dvb/dvbpanel.cpp b/kaffeine/src/input/dvb/dvbpanel.cpp +index 1b54229..365b7ac 100644 +--- a/kaffeine/src/input/dvb/dvbpanel.cpp ++++ b/kaffeine/src/input/dvb/dvbpanel.cpp +@@ -307,7 +307,7 @@ void DvbPanel::diskStatus() + + freemb = (double)(((double)(buf.f_bavail)*(double)(buf.f_bsize))/(1024.0*1024.0)); + if ( freemb<300 ) +- emit showOSD( i18n("Warning: low disc space")+TQString(" (%1").tqarg((int)freemb)+i18n("MB")+")", 5000, 3 ); ++ emit showOSD( i18n("Warning: low disc space")+TQString(" (%1").arg((int)freemb)+i18n("MB")+")", 5000, 3 ); + } + + +@@ -649,15 +649,15 @@ void DvbPanel::dumpEvents() + for( i=0; i<events.getNSource(); i++ ) { + if ( !(esrc=events.getNEventSource( i )) ) + continue; +- tt << esrc->getSource()+TQString(" : %1 TS with events.\n").tqarg( esrc->getNTsid() ); ++ tt << esrc->getSource()+TQString(" : %1 TS with events.\n").arg( esrc->getNTsid() ); + for ( m=0; m<esrc->getNTsid(); m++ ) { + if ( !(et=esrc->getNEventTsid( m )) ) + continue; +- tt << TQString("TSID %1 : %2 services with events\n").tqarg( et->getTsid() ).tqarg( et->getNSid() ); ++ tt << TQString("TSID %1 : %2 services with events\n").arg( et->getTsid() ).arg( et->getNSid() ); + for ( n=0; n<et->getNSid(); n++ ) { + if ( !(es=et->getNEventSid( n )) ) + continue; +- tt << TQString(" SID %1 : %2 events\n").tqarg( es->getSid() ).tqarg( es->getNDesc() ); ++ tt << TQString(" SID %1 : %2 events\n").arg( es->getSid() ).arg( es->getNDesc() ); + k+= es->getNDesc(); + } + } +@@ -681,10 +681,10 @@ void DvbPanel::dumpEvents() + if ( !(desc=esEvents->at( j )) ) + continue; + tt << "Source: "+desc->source+"\n"; +- tt << TQString("Network ID: %1\n").tqarg(desc->nid); +- tt << TQString("Transport Stream ID: %1\n").tqarg(desc->tsid); +- tt << TQString("Service ID: %1\n").tqarg(desc->sid); +- tt << TQString("Event ID: %1\n").tqarg(desc->eid); ++ tt << TQString("Network ID: %1\n").arg(desc->nid); ++ tt << TQString("Transport Stream ID: %1\n").arg(desc->tsid); ++ tt << TQString("Service ID: %1\n").arg(desc->sid); ++ tt << TQString("Event ID: %1\n").arg(desc->eid); + tt << "Title: "+desc->title+"\n"; + tt << "Subtitle: "+desc->subtitle+"\n"; + tt << desc->startDateTime.toString( "dd-MM-yyyy hh:mm:ss" )+"\n"; +diff --git a/kaffeine/src/input/dvb/dvbsi.cpp b/kaffeine/src/input/dvb/dvbsi.cpp +index cce9d0c..7fd8669 100644 +--- a/kaffeine/src/input/dvb/dvbsi.cpp ++++ b/kaffeine/src/input/dvb/dvbsi.cpp +@@ -620,7 +620,7 @@ bool DVBsi::tablePAT( unsigned char *buf ) + desc->tp.tsid = tsid; + desc->sid = sid; + desc->pmtpid = pmt; +- desc->name = TQString("TSID:%1-SID:%2").tqarg(tsid).tqarg(sid); ++ desc->name = TQString("TSID:%1-SID:%2").arg(tsid).arg(sid); + } + } + +@@ -854,7 +854,7 @@ bool DVBsi::parseVCT( int pid, int tid, int timeout, int sid ) + + ChannelDesc *desc = new ChannelDesc(); + desc->tp.tsid = channel_tsid; +- desc->name = TQString("%1-%2 %3").tqarg(major_channel_num).tqarg(minor_channel_num).tqarg(short_name); ++ desc->name = TQString("%1-%2 %3").arg(major_channel_num).arg(minor_channel_num).arg(short_name); + desc->sid = program_number; + if (access_controlled == 1) + desc->fta = 1; +diff --git a/kaffeine/src/input/dvb/dvbstream.cpp b/kaffeine/src/input/dvb/dvbstream.cpp +index 4ef290b..be8ae7d 100644 +--- a/kaffeine/src/input/dvb/dvbstream.cpp ++++ b/kaffeine/src/input/dvb/dvbstream.cpp +@@ -65,9 +65,9 @@ DvbStream::DvbStream( Device *d, const TQString &charset, EventTable *et ) + fdFrontend = fdDvr = 0; + ndmx = 0; + currentTransponder = Transponder(); +- frontendName = TQString("/dev/dvb/adapter%1/frontend%2").tqarg( dvbDevice->adapter ).tqarg( dvbDevice->tuner ); +- dvrName = TQString("/dev/dvb/adapter%1/dvr%2").tqarg( dvbDevice->adapter ).tqarg( dvbDevice->tuner ); +- demuxName = TQString("/dev/dvb/adapter%1/demux%2").tqarg( dvbDevice->adapter ).tqarg( dvbDevice->tuner ); ++ frontendName = TQString("/dev/dvb/adapter%1/frontend%2").arg( dvbDevice->adapter ).arg( dvbDevice->tuner ); ++ dvrName = TQString("/dev/dvb/adapter%1/dvr%2").arg( dvbDevice->adapter ).arg( dvbDevice->tuner ); ++ demuxName = TQString("/dev/dvb/adapter%1/demux%2").arg( dvbDevice->adapter ).arg( dvbDevice->tuner ); + + out.setAutoDelete( true ); + +diff --git a/kaffeine/src/input/dvb/kgradprogress.cpp b/kaffeine/src/input/dvb/kgradprogress.cpp +index 7898f84..07030e4 100644 +--- a/kaffeine/src/input/dvb/kgradprogress.cpp ++++ b/kaffeine/src/input/dvb/kgradprogress.cpp +@@ -43,7 +43,7 @@ void KGradProgress::setProgress( int progress ) + { + current = progress; + draw(); +- tqrepaint(false); ++ repaint(false); + } + + +diff --git a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp +index 44619b7..3c49848 100644 +--- a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp ++++ b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp +@@ -70,7 +70,7 @@ KaffeineDVBsection::~KaffeineDVBsection() + bool KaffeineDVBsection::setFilter( int pid, int tid, int timeout, bool checkcrc ) + { + struct dmx_sct_filter_params sctfilter; +- TQString demuxer = TQString("/dev/dvb/adapter%1/demux%2").tqarg( adapter ).tqarg( tuner ); ++ TQString demuxer = TQString("/dev/dvb/adapter%1/demux%2").arg( adapter ).arg( tuner ); + + if ((fdDemux = open( demuxer.ascii(), O_RDWR | O_NONBLOCK )) < 0) { + perror ("open failed"); +diff --git a/kaffeine/src/input/dvb/scandialog.cpp b/kaffeine/src/input/dvb/scandialog.cpp +index 7f760e6..9b68d93 100644 +--- a/kaffeine/src/input/dvb/scandialog.cpp ++++ b/kaffeine/src/input/dvb/scandialog.cpp +@@ -71,7 +71,7 @@ ScanDialog::ScanDialog( TQPtrList<DvbStream> *d, TQPtrList<ChannelDesc> *ch, TQS + tmp = dvb->at(i)->getSources( true ); + for ( j=0; j<(int)tmp.count(); j++ ) { + if ( tmp[j].startsWith( "AUTO" ) ) +- list.append( TQString("AUTO(%1:%2)").tqarg(dvb->at(i)->getAdapter()).tqarg(dvb->at(i)->getTuner()) ); ++ list.append( TQString("AUTO(%1:%2)").arg(dvb->at(i)->getAdapter()).arg(dvb->at(i)->getTuner()) ); + else + list.append( tmp[j] ); + } +@@ -614,25 +614,25 @@ bool ScanDialog::getTransData() + int i; + for ( i=177; i<227; i+=7 ) { + if ( offset07->isChecked() ) { +- s = TQString("T %1 7MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( (i*1000000)+500000 ); ++ s = TQString("T %1 7MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( (i*1000000)+500000 ); + parseTp( s, ds->getType(), "" ); + } + if ( offset125p->isChecked() ) { +- s = TQString("T %1 7MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( (i*1000000)+500000+125000 ); ++ s = TQString("T %1 7MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( (i*1000000)+500000+125000 ); + parseTp( s, ds->getType(), "" ); + } + } + for ( i=474; i<859; i+=8 ) { + if ( offset167m->isChecked() ) { +- s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( (i*1000000)-167000 ); ++ s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( (i*1000000)-167000 ); + parseTp( s, ds->getType(), "" ); + } + if ( offset0->isChecked() ) { +- s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( i*1000000 ); ++ s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( i*1000000 ); + parseTp( s, ds->getType(), "" ); + } + if ( offset167p->isChecked() ) { +- s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( (i*1000000)+167000 ); ++ s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( (i*1000000)+167000 ); + parseTp( s, ds->getType(), "" ); + } + } +@@ -1010,7 +1010,7 @@ void ScanDialog::addFound( ChannelDesc *chan, bool scan ) + int i; + DListViewItem *it; + +- it = new DListViewItem( foundList, chan, TQString( "%1").tqarg( chan->tp.snr ), chan->name ); ++ it = new DListViewItem( foundList, chan, TQString( "%1").arg( chan->tp.snr ), chan->name ); + + if ( chan->type==1 ) { + if ( scan ) +@@ -1030,7 +1030,7 @@ void ScanDialog::addFound( ChannelDesc *chan, bool scan ) + } + + if ( scan ) +- progressLab->setText( TQString( i18n("Found: %1 TV - %2 radio") ).tqarg(ntv).tqarg(nradio) ); ++ progressLab->setText( TQString( i18n("Found: %1 TV - %2 radio") ).arg(ntv).arg(nradio) ); + if ( chan->provider.isEmpty() ) + return; + for ( i=0; i<providerComb->count(); i++ ) { +diff --git a/kaffeine/src/instwizard.cpp b/kaffeine/src/instwizard.cpp +index 8e2f412..0bc4a31 100644 +--- a/kaffeine/src/instwizard.cpp ++++ b/kaffeine/src/instwizard.cpp +@@ -49,7 +49,7 @@ + + void InstWizard::internalWizard() + { +- setCaption(i18n("Kaffeine %1 Installation Wizard").tqarg(KAFFEINE_VERSION)); ++ setCaption(i18n("Kaffeine %1 Installation Wizard").arg(KAFFEINE_VERSION)); + resize(400,400); + + /************** installation check ************************/ +@@ -79,7 +79,7 @@ void InstWizard::internalWizard() + if (KDE::version() >= KDE_MAKE_VERSION(3,2,0)) + info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>"; + else +- info << "<font color=\"DarkRed\">" << i18n("Kaffeine requires KDE >= %1.").tqarg("3.2") << "</font>"; ++ info << "<font color=\"DarkRed\">" << i18n("Kaffeine requires KDE >= %1.").arg("3.2") << "</font>"; + + //XINE-LIB + //Should engine depending stuff be here? +@@ -96,13 +96,13 @@ void InstWizard::internalWizard() + + if ((major == 1) && (minor == 0) && (sub == 0) && (xineVersion.contains("rc", false))) + { +- info << "<font color=\"DarkRed\">" << i18n("Kaffeine requires xine-lib >= %1. Download the latest version here:").tqarg("1.0") << " <a href=\"http://www.xinehq.de\">http://www.xinehq.de</a>.</font>"; ++ info << "<font color=\"DarkRed\">" << i18n("Kaffeine requires xine-lib >= %1. Download the latest version here:").arg("1.0") << " <a href=\"http://www.xinehq.de\">http://www.xinehq.de</a>.</font>"; + } + else + info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>"; + } + else +- info << "<font color=\"DarkRed\">" << i18n("Kaffeine requires xine-lib >= %1. Download the latest version here:").tqarg("1.0") ++ info << "<font color=\"DarkRed\">" << i18n("Kaffeine requires xine-lib >= %1. Download the latest version here:").arg("1.0") + << " <a href=\"http://www.xinehq.de\">http://www.xinehq.de</a>.</font>"; + */ + //WIN32-CODECS +diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp +index 5b188da..9efebc9 100644 +--- a/kaffeine/src/kaffeine.cpp ++++ b/kaffeine/src/kaffeine.cpp +@@ -154,8 +154,8 @@ Kaffeine::Kaffeine() : DCOPObject("KaffeineIface"), + //createStandardStatusBarAction(); + createGUI("kaffeineui.rc"); + +- //statusBar()->insertItem(i18n("Entries: %1, Playtime: %2 (Total: %3, %4)").tqarg("0").tqarg("00:00:00").tqarg("0").tqarg("00:00:00"), 9, 0, true); +- //statusBar()->insertItem(i18n("Entries: %1, Playtime: %2").tqarg("0").tqarg("0:00:00"), 9, 0, true); ++ //statusBar()->insertItem(i18n("Entries: %1, Playtime: %2 (Total: %3, %4)").arg("0").arg("00:00:00").arg("0").arg("00:00:00"), 9, 0, true); ++ //statusBar()->insertItem(i18n("Entries: %1, Playtime: %2").arg("0").arg("0:00:00"), 9, 0, true); + //statusBar()->insertItem(i18n("No player"), 10, 0, true); + + TQString stamp = locateLocal("appdata", "wizard_stamp_v0.7.1"); +@@ -367,7 +367,7 @@ void Kaffeine::slotLoadPart(const TQString& desktopName) + KService::Ptr service = KService::serviceByDesktopName(desktopName); + if (!service) + { +- KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").tqarg(desktopName), i18n("%1 not found in search path.").tqarg(TQString(desktopName)+ ".desktop")); ++ KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").arg(desktopName), i18n("%1 not found in search path.").arg(TQString(desktopName)+ ".desktop")); + return; + } + +@@ -387,7 +387,7 @@ void Kaffeine::slotLoadPart(const TQString& desktopName) + int error = 0; + m_mediaPart = KParts::ComponentFactory::createPartInstanceFromService<KaffeinePart>(service, m_playerContainer, service->name().ascii(), TQT_TQOBJECT(this), 0, m_engineParameters, &error); + if (error > 0) { +- KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").tqarg(service->name()), KLibLoader::self()->lastErrorMessage()); ++ KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").arg(service->name()), KLibLoader::self()->lastErrorMessage()); + } + else { + connect(m_mediaPart, TQT_SIGNAL(setWindowCaption(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeCaption(const TQString&))); +@@ -455,7 +455,7 @@ void Kaffeine::slotLoadingCanceled(const TQString& message) + delete m_mediaPart; + m_mediaPart = NULL; + } +- KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").tqarg(name), message); ++ KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").arg(name), message); + } + + void Kaffeine::slotPlaybackFailed() +@@ -1439,7 +1439,7 @@ TQString Kaffeine::askForOtherDevice(const TQString& type) + TQVBox* page = dialog->makeVBoxMainWidget(); + page->setSpacing(5); + page->setMargin(5); +- new TQLabel(i18n("No %1 in drive, or wrong path to device.").tqarg(type), page); ++ new TQLabel(i18n("No %1 in drive, or wrong path to device.").arg(type), page); + new TQLabel(TQString("\n") + i18n("Please select correct drive:"), page); + DrivesCombo* drives = new DrivesCombo(page); + +diff --git a/kaffeine/src/kmultitabbar.cpp b/kaffeine/src/kmultitabbar.cpp +index 308bfa5..ecfa2c5 100644 +--- a/kaffeine/src/kmultitabbar.cpp ++++ b/kaffeine/src/kmultitabbar.cpp +@@ -111,7 +111,7 @@ void KMultiTabBarInternal::setStyle(enum KMultiTabBar::KMultiTabBarStyle style) + mainLayout->setAutoAdd(true); + + } +- viewport()->tqrepaint(); ++ viewport()->repaint(); + } + + void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clipy, int clipw, int cliph ) +@@ -189,8 +189,8 @@ void KMultiTabBarInternal::mousePressEvent(TQMouseEvent *ev) + + void KMultiTabBarInternal::resizeEvent(TQResizeEvent *ev) { + /* kdDebug()<<"KMultiTabBarInternal::resizeEvent"<<endl; +- kdDebug()<<"KMultiTabBarInternal::resizeEvent - box tqgeometry"<<box->tqgeometry()<<endl; +- kdDebug()<<"KMultiTabBarInternal::resizeEvent - tqgeometry"<<tqgeometry()<<endl;*/ ++ kdDebug()<<"KMultiTabBarInternal::resizeEvent - box geometry"<<box->geometry()<<endl; ++ kdDebug()<<"KMultiTabBarInternal::resizeEvent - geometry"<<geometry()<<endl;*/ + if (ev) TQScrollView::resizeEvent(ev); + + if ( (m_style==KMultiTabBar::KDEV3) || +@@ -379,7 +379,7 @@ void KMultiTabBarInternal::setPosition(enum KMultiTabBar::KMultiTabBarPosition p + m_position=pos; + for (uint i=0;i<m_tabs.count();i++) + m_tabs.at(i)->setTabsPosition(m_position); +- viewport()->tqrepaint(); ++ viewport()->repaint(); + } + + +@@ -436,13 +436,13 @@ void KMultiTabBarButton::slotClicked() + void KMultiTabBarButton::setPosition(KMultiTabBar::KMultiTabBarPosition pos) + { + m_position=pos; +- tqrepaint(); ++ repaint(); + } + + void KMultiTabBarButton::setStyle(KMultiTabBar::KMultiTabBarStyle style) + { + m_style=style; +- tqrepaint(); ++ repaint(); + } + + void KMultiTabBarButton::hideEvent( TQHideEvent* he) { +@@ -528,7 +528,7 @@ void KMultiTabBarTab::setTabsPosition(KMultiTabBar::KMultiTabBarPosition pos) + } + + setPosition(pos); +-// tqrepaint(); ++// repaint(); + } + + void KMultiTabBarTab::setIcon(const TQString& icon) +@@ -992,7 +992,7 @@ void KMultiTabBar::fontChange(const TQFont& /* oldFont */) + { + for (uint i=0;i<tabs()->count();i++) + tabs()->at(i)->resize(); +- tqrepaint(); ++ repaint(); + } + + TQPtrList<KMultiTabBarTab>* KMultiTabBar::tabs() {return m_internal->tabs();} +diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp +index 2255e67..fb6e7a3 100644 +--- a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp ++++ b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp +@@ -737,7 +737,7 @@ void GStreamerPart::setAudioSink( TQString sinkName ) + { + GstElement* sink = gst_element_factory_make(sinkName.ascii(), "audiosink"); + if ( !sink ) { +- KMessageBox::error(0, i18n("Error: Can't init new Audio Driver %1 - using %2!").tqarg(sinkName).tqarg(m_audioSinkName)); ++ KMessageBox::error(0, i18n("Error: Can't init new Audio Driver %1 - using %2!").arg(sinkName).arg(m_audioSinkName)); + return; + } + +@@ -785,7 +785,7 @@ bool GStreamerPart::initGStreamer() + */ + m_audiosink = gst_element_factory_make( m_audioSinkName.ascii(), "audiosink" ); + if ( !m_audiosink ) { +- KMessageBox::error(0, i18n("Can't init Audio Driver '%1' - trying another one...").tqarg(m_audioSinkName)); ++ KMessageBox::error(0, i18n("Can't init Audio Driver '%1' - trying another one...").arg(m_audioSinkName)); + if ( (m_audiosink = gst_element_factory_make("alsasink", "audiosink")) != NULL ) + kdDebug() << "GStreamerPart: Using audio-driver: alsasink" << endl; + else { +@@ -809,7 +809,7 @@ bool GStreamerPart::initGStreamer() + */ + m_videosink = gst_element_factory_make( m_videoSinkName.ascii(), "videosink" ); + if ( !m_videosink ) { +- KMessageBox::error(0, i18n("Can't init Video Driver '%1' - trying another one...").tqarg(m_videoSinkName)); ++ KMessageBox::error(0, i18n("Can't init Video Driver '%1' - trying another one...").arg(m_videoSinkName)); + if ((m_videosink = gst_element_factory_make("xvimagesink", "videosink")) != NULL) + kdDebug() << "GStreamerPart: Using video-driver: xvimagesink" << endl; + else { +diff --git a/kaffeine/src/player-parts/gstreamer-part/video.cpp b/kaffeine/src/player-parts/gstreamer-part/video.cpp +index eb6203f..96752aa 100644 +--- a/kaffeine/src/player-parts/gstreamer-part/video.cpp ++++ b/kaffeine/src/player-parts/gstreamer-part/video.cpp +@@ -134,7 +134,7 @@ void VideoWindow::newCapsset( const GstCaps *caps ) + TQSize frame = getFrameSize(); + correctByAspectRatio( frame ); + emit signalNewFrameSize( frame ); +- //set correct tqgeometry ++ //set correct geometry + setGeometry(); + } + +@@ -177,7 +177,7 @@ void VideoWindow::newState() + TQSize frame = getFrameSize(); + correctByAspectRatio( frame ); + emit signalNewFrameSize( frame ); +- //set correct tqgeometry ++ //set correct geometry + setGeometry(); + } + +diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp +index 58a9818..acc9937 100644 +--- a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp ++++ b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp +@@ -153,14 +153,14 @@ KXineWidget::~KXineWidget() + { + debugOut("Unwire audio filters"); + unwireAudioFilters(); +- debugOut(TQString("Dispose visual plugin: %1").tqarg(m_visualPluginName )); ++ debugOut(TQString("Dispose visual plugin: %1").arg(m_visualPluginName )); + delete m_visualPlugin; + m_visualPlugin = NULL; + } + #else + if (m_xinePost) + { +- debugOut(TQString("Dispose visual plugin: %1").tqarg(m_visualPluginName)); ++ debugOut(TQString("Dispose visual plugin: %1").arg(m_visualPluginName)); + m_postAudioSource = xine_get_audio_source(m_xineStream); + xine_post_wire_audio_port(m_postAudioSource, m_audioDriver); + xine_post_dispose(m_xineEngine, m_xinePost); +@@ -279,7 +279,7 @@ void KXineWidget::saveXineConfig() + xine_config_update_entry (m_xineEngine, &config); + } + +- debugOut(TQString("Save xine config to: %1").tqarg(m_configFilePath)); ++ debugOut(TQString("Save xine config to: %1").arg(m_configFilePath)); + xine_config_save(m_xineEngine, m_configFilePath.ascii()); + } + +@@ -331,7 +331,7 @@ void KXineWidget::frameOutputCallback(void* p, int video_width, int video_height + /* frame size changed */ + if ( (video_width != vw->m_videoFrameWidth) || (video_height != vw->m_videoFrameHeight) ) + { +- debugOut(TQString("New video frame size: %1x%2 - aspect ratio: %3").tqarg(video_width).tqarg(video_height).tqarg(video_aspect)); ++ debugOut(TQString("New video frame size: %1x%2 - aspect ratio: %3").arg(video_width).arg(video_height).arg(video_aspect)); + vw->m_videoFrameWidth = video_width; + vw->m_videoFrameHeight = video_height; + vw->m_videoAspect = video_aspect; +@@ -343,7 +343,7 @@ void KXineWidget::frameOutputCallback(void* p, int video_width, int video_height + { + vw->m_newParentSize = vw->parentWidget()->size() - TQSize((vw->width() - video_width), vw->height() - video_height); + +- debugOut(TQString("Resize video window to: %1x%2").tqarg(vw->m_newParentSize.width()).tqarg(vw->m_newParentSize.height())); ++ debugOut(TQString("Resize video window to: %1x%2").arg(vw->m_newParentSize.width()).arg(vw->m_newParentSize.height())); + + /* we should not do a resize() inside a xine thread, + but post an event to the main thread */ +@@ -391,7 +391,7 @@ void KXineWidget::xineEventListener(void *p, const xine_event_t* xineEvent) + channels = xine_get_stream_info(vw->m_xineStream, XINE_STREAM_INFO_MAX_AUDIO_CHANNEL); + for(i = 0; i < channels; i++) + { +- slang = TQString("%1.").tqarg(i+1); ++ slang = TQString("%1.").arg(i+1); + if (xine_get_audio_lang(vw->m_xineStream, i, lang)) + slang += lang; + tmp << slang; +@@ -415,7 +415,7 @@ void KXineWidget::xineEventListener(void *p, const xine_event_t* xineEvent) + channels = xine_get_stream_info(vw->m_xineStream, XINE_STREAM_INFO_MAX_SPU_CHANNEL); + for(i = 0; i<channels; i++) + { +- slang = TQString("%1.").tqarg(i+1); ++ slang = TQString("%1.").arg(i+1); + if (xine_get_spu_lang(vw->m_xineStream, i, lang)) + slang += lang; + tmp << slang; +@@ -472,7 +472,7 @@ void KXineWidget::xineEventListener(void *p, const xine_event_t* xineEvent) + debugOut("xine event: dropped frames"); + xine_dropped_frames_t* dropped = (xine_dropped_frames_t*)xineEvent->data; + +- warningOut(TQString("Skipped frames: %1 - discarded frames: %2").tqarg(dropped->skipped_frames/10).tqarg(dropped->discarded_frames/10)); ++ warningOut(TQString("Skipped frames: %1 - discarded frames: %2").arg(dropped->skipped_frames/10).arg(dropped->discarded_frames/10)); + + break; + } +@@ -752,7 +752,7 @@ void KXineWidget::timerEvent( TQTimerEvent* tevent ) + else + { + //restart +- warningOut(TQString("Message: '%1' was blocked!").tqarg(m_xineMessage)); ++ warningOut(TQString("Message: '%1' was blocked!").arg(m_xineMessage)); + m_recentMessagesTimer.start(1500); + } + break; +@@ -795,7 +795,7 @@ void KXineWidget::videoDriverChangedCallback(void* p, xine_cfg_entry_t* entry) + + int pos, time, length; + +- debugOut(TQString("New video driver: %1").tqarg(entry->enum_values[entry->num_value])); ++ debugOut(TQString("New video driver: %1").arg(entry->enum_values[entry->num_value])); + + if (vw->m_osd) + { +@@ -835,7 +835,7 @@ void KXineWidget::videoDriverChangedCallback(void* p, xine_cfg_entry_t* entry) + vw->unwireAudioFilters(); + if (vw->m_visualPlugin) + { +- debugOut(TQString("Dispose visual plugin: %1").tqarg(vw->m_visualPluginName)); ++ debugOut(TQString("Dispose visual plugin: %1").arg(vw->m_visualPluginName)); + delete vw->m_visualPlugin; + vw->m_visualPlugin = NULL; + } +@@ -855,7 +855,7 @@ void KXineWidget::videoDriverChangedCallback(void* p, xine_cfg_entry_t* entry) + + if (!vw->m_videoDriver) + { +- vw->m_xineError = i18n("Error: Can't init new Video Driver %1 - using %2!").tqarg(entry->enum_values[entry->num_value]).tqarg(vw->m_videoDriverName); ++ vw->m_xineError = i18n("Error: Can't init new Video Driver %1 - using %2!").arg(entry->enum_values[entry->num_value]).arg(vw->m_videoDriverName); + TQApplication::postEvent(vw, new TQTimerEvent( TIMER_EVENT_NEW_XINE_ERROR)); + playing = false; + vw->m_videoDriver = xine_open_video_driver(vw->m_xineEngine, +@@ -869,7 +869,7 @@ void KXineWidget::videoDriverChangedCallback(void* p, xine_cfg_entry_t* entry) + else + { + vw->m_videoDriverName = entry->enum_values[entry->num_value]; +- vw->m_statusString = i18n("Using Video Driver: %1").tqarg(vw->m_videoDriverName); ++ vw->m_statusString = i18n("Using Video Driver: %1").arg(vw->m_videoDriverName); + TQApplication::postEvent(vw, new TQTimerEvent(TIMER_EVENT_NEW_STATUS)); + } + +@@ -902,7 +902,7 @@ void KXineWidget::audioDriverChangedCallback(void* p, xine_cfg_entry_t* entry) + + int pos, time, length; + +- debugOut(TQString("New audio driver: %1").tqarg(entry->enum_values[entry->num_value])); ++ debugOut(TQString("New audio driver: %1").arg(entry->enum_values[entry->num_value])); + + if (vw->m_osd) + { +@@ -931,7 +931,7 @@ void KXineWidget::audioDriverChangedCallback(void* p, xine_cfg_entry_t* entry) + vw->unwireAudioFilters(); + if (vw->m_visualPlugin) + { +- debugOut(TQString("Dispose visual plugin: %1").tqarg(vw->m_visualPluginName)); ++ debugOut(TQString("Dispose visual plugin: %1").arg(vw->m_visualPluginName)); + delete vw->m_visualPlugin; + vw->m_visualPlugin = NULL; + } +@@ -945,7 +945,7 @@ void KXineWidget::audioDriverChangedCallback(void* p, xine_cfg_entry_t* entry) + + if (!vw->m_audioDriver) + { +- vw->m_xineError = i18n("Error: Can't init new Audio Driver %1 - using %2!").tqarg(entry->enum_values[entry->num_value]).tqarg(vw->m_audioDriverName); ++ vw->m_xineError = i18n("Error: Can't init new Audio Driver %1 - using %2!").arg(entry->enum_values[entry->num_value]).arg(vw->m_audioDriverName); + TQApplication::postEvent(vw, new TQTimerEvent( TIMER_EVENT_NEW_XINE_ERROR)); + playing = false; + vw->m_audioDriver = xine_open_audio_driver(vw->m_xineEngine, vw->m_audioDriverName.ascii(), NULL); +@@ -953,7 +953,7 @@ void KXineWidget::audioDriverChangedCallback(void* p, xine_cfg_entry_t* entry) + else + { + vw->m_audioDriverName = entry->enum_values[entry->num_value]; +- vw->m_statusString = i18n("Using Audio Driver: %1").tqarg(vw->m_audioDriverName); ++ vw->m_statusString = i18n("Using Audio Driver: %1").arg(vw->m_audioDriverName); + TQApplication::postEvent(vw, new TQTimerEvent(TIMER_EVENT_NEW_STATUS)); + } + +@@ -1148,18 +1148,18 @@ bool KXineWidget::initXine() + int count = 1; + debugOut("Xinerama extension present"); + XineramaQueryScreens(x11Display(), &count); +- debugOut(TQString("%1 screens detected").tqarg(count)); ++ debugOut(TQString("%1 screens detected").arg(count)); + if (count > 1) + // multihead -> assuming square pixels + m_displayRatio = 1.0; + } + #endif + +- debugOut(TQString("Display aspect ratio (v/h): %1").tqarg(m_displayRatio));*/ ++ debugOut(TQString("Display aspect ratio (v/h): %1").arg(m_displayRatio));*/ + + /**** INIT XINE ENGINE ****/ + +- debugOut(TQString("Using xine version %1").tqarg(xine_get_version_string())); ++ debugOut(TQString("Using xine version %1").arg(xine_get_version_string())); + + m_xineEngine = xine_new(); + if (!m_xineEngine) +@@ -1209,7 +1209,7 @@ bool KXineWidget::initXine() + else + m_audioDriverName = m_audioChoices[i]; + +- debugOut(TQString("Use audio driver %1").tqarg(m_audioDriverName)); ++ debugOut(TQString("Use audio driver %1").arg(m_audioDriverName)); + + drivers = xine_list_video_output_plugins(m_xineEngine); + i = 0; +@@ -1235,7 +1235,7 @@ bool KXineWidget::initXine() + else + m_videoDriverName = m_videoChoices[i]; + +- debugOut(TQString("Use video driver %1").tqarg(m_videoDriverName)); ++ debugOut(TQString("Use video driver %1").arg(m_videoDriverName)); + + m_mixerInfo = strdup(i18n("Use software audio mixer").local8Bit()); + m_softwareMixer = (bool)xine_config_register_bool(m_xineEngine, "audio.mixer_software", 1, m_mixerInfo, +@@ -1307,7 +1307,7 @@ bool KXineWidget::initXine() + + if (!m_videoDriver && m_videoDriverName != "auto") + { +- emit signalXineError(i18n("Can't init Video Driver '%1' - trying 'auto'...").tqarg(m_videoDriverName)); ++ emit signalXineError(i18n("Can't init Video Driver '%1' - trying 'auto'...").arg(m_videoDriverName)); + m_videoDriverName = "auto"; + m_videoDriver = xine_open_video_driver(m_xineEngine, + #ifndef HAVE_XCB +@@ -1331,7 +1331,7 @@ bool KXineWidget::initXine() + + if (!m_audioDriver && m_audioDriverName != "auto") + { +- emit signalXineError(i18n("Can't init Audio Driver '%1' - trying 'auto'...").tqarg(m_audioDriverName)); ++ emit signalXineError(i18n("Can't init Audio Driver '%1' - trying 'auto'...").arg(m_audioDriverName)); + m_audioDriverName = "auto"; + m_audioDriver = xine_open_audio_driver (m_xineEngine, m_audioDriverName.ascii(), NULL); + } +@@ -1395,12 +1395,12 @@ void KXineWidget::initOSD() + { + if (!xine_osd_set_font(m_osd, m_osdFont, fontsizetable[m_osdSize])) + { +- debugOut(TQString("Font ->%1<- specified for OSD doesn't exists.").tqarg(m_osdFont)); ++ debugOut(TQString("Font ->%1<- specified for OSD doesn't exists.").arg(m_osdFont)); + free(m_osdFont); + m_osdFont = strdup("sans"); + xine_osd_set_font(m_osd, m_osdFont, fontsizetable[m_osdSize]); + } +- debugOut(TQString("Font for OSD: %1").tqarg(m_osdFont)); ++ debugOut(TQString("Font for OSD: %1").arg(m_osdFont)); + xine_osd_set_text_palette(m_osd, XINE_TEXTPALETTE_WHITE_BLACK_TRANSPARENT, XINE_OSD_TEXT1); + m_osdUnscaled = (xine_osd_get_capabilities(m_osd) & XINE_OSD_CAP_UNSCALED); + if (m_osdUnscaled) +@@ -1428,7 +1428,7 @@ bool KXineWidget::playDvb() + { + if (!m_visualPlugin) + { +- debugOut(TQString("Init visual plugin: %1").tqarg(m_visualPluginName)); ++ debugOut(TQString("Init visual plugin: %1").arg(m_visualPluginName)); + m_visualPlugin = new PostFilter(m_visualPluginName, m_xineEngine, m_audioDriver, m_videoDriver, NULL); + } + +@@ -1438,7 +1438,7 @@ bool KXineWidget::playDvb() + { + if (m_visualPlugin) + { +- debugOut(TQString("Dispose visual plugin: %1").tqarg(m_visualPluginName)); ++ debugOut(TQString("Dispose visual plugin: %1").arg(m_visualPluginName)); + delete m_visualPlugin; + m_visualPlugin = NULL; + } +@@ -1978,7 +1978,7 @@ void KXineWidget::slotPlay() + if ( turl.startsWith("/") ) + turl.prepend("file://"); + +- debugOut(TQString("Playing: %1").tqarg(turl.local8Bit().data())); ++ debugOut(TQString("Playing: %1").arg(turl.local8Bit().data())); + + xine_set_param( m_xineStream, XINE_PARAM_METRONOM_PREBUFFER, 12000 ); + if (!xine_open(m_xineStream, TQFile::encodeName(turl))) { +@@ -2002,7 +2002,7 @@ void KXineWidget::slotPlay() + { + if (m_visualPluginName && (!m_xinePost)) + { +- debugOut(TQString("Init visual plugin: %1").tqarg(m_visualPluginName)); ++ debugOut(TQString("Init visual plugin: %1").arg(m_visualPluginName)); + m_xinePost = xine_post_init(m_xineEngine, m_visualPluginName, 0, + &m_audioDriver, + &m_videoDriver); +@@ -2016,7 +2016,7 @@ void KXineWidget::slotPlay() + { + if (m_xinePost) + { +- debugOut(TQString("Dispose visual plugin: %1").tqarg(m_visualPluginName)); ++ debugOut(TQString("Dispose visual plugin: %1").arg(m_visualPluginName)); + m_postAudioSource = xine_get_audio_source(m_xineStream); + xine_post_wire_audio_port(m_postAudioSource, m_audioDriver); + xine_post_dispose(m_xineEngine, m_xinePost); +@@ -2248,7 +2248,7 @@ void KXineWidget::sendXineError() + else + { + errorOut(error); +- errorOut(TQString("Can't play: %1 - trying next").tqarg(m_trackURL)); ++ errorOut(TQString("Can't play: %1 - trying next").arg(m_trackURL)); + TQTimer::singleShot(0, this, TQT_SLOT(slotPlay())); + } + } +@@ -2290,7 +2290,7 @@ void KXineWidget::showOSDMessage(const TQString& message, uint duration, int pri + return; + prevOsdPriority = priority; + +- //debugOut(TQString("OSD: draw text: %1").tqarg(message)); ++ //debugOut(TQString("OSD: draw text: %1").arg(message)); + xine_osd_clear(m_osd); + xine_osd_draw_text(m_osd, 0, 0, message.local8Bit(), XINE_OSD_TEXT1); + +@@ -2348,7 +2348,7 @@ void KXineWidget::slotCreateVideoFilter(const TQString& name, TQWidget* parent) + wireVideoFilters(); + #else + parent = parent; +- warningOut(TQString("Not implemented [CreateVideoFilter %1]").tqarg(name)); ++ warningOut(TQString("Not implemented [CreateVideoFilter %1]").arg(name)); + #endif + } + +@@ -2364,7 +2364,7 @@ void KXineWidget::slotCreateAudioFilter(const TQString& name, TQWidget* parent) + wireAudioFilters(); + #else + parent = parent; +- warningOut(TQString("Not implemented [CreateAudioFilter %1]").tqarg(name)); ++ warningOut(TQString("Not implemented [CreateAudioFilter %1]").arg(name)); + #endif + } + +@@ -2478,7 +2478,7 @@ void KXineWidget::wireAudioFilters() + { + if (!m_visualPlugin) + { +- debugOut(TQString("Init visual plugin: %1").tqarg(m_visualPluginName)); ++ debugOut(TQString("Init visual plugin: %1").arg(m_visualPluginName)); + m_visualPlugin = new PostFilter(m_visualPluginName, m_xineEngine, m_audioDriver, m_videoDriver, NULL); + } + +@@ -2488,7 +2488,7 @@ void KXineWidget::wireAudioFilters() + { + if (m_visualPlugin) + { +- debugOut(TQString("Dispose visual plugin: %1").tqarg(m_visualPluginName)); ++ debugOut(TQString("Dispose visual plugin: %1").arg(m_visualPluginName)); + delete m_visualPlugin; + m_visualPlugin = NULL; + } +@@ -2571,7 +2571,7 @@ TQStringList KXineWidget::getVisualPlugins() const + void KXineWidget::slotSetVisualPlugin(const TQString& visual) + { + if (m_visualPluginName == visual) return; +- debugOut(TQString("New visualization plugin: %1").tqarg(visual)); ++ debugOut(TQString("New visualization plugin: %1").arg(visual)); + + #ifndef USE_TQT_ONLY + unwireAudioFilters(); +@@ -2660,7 +2660,7 @@ void KXineWidget::slotSetVolume(int vol) + if (!isXineReady()) return; + if (m_softwareMixer) + { +- //debugOut(TQString("Set software amplification level: %1").tqarg(vol)); ++ //debugOut(TQString("Set software amplification level: %1").arg(vol)); + if (m_volumeGain) + xine_set_param(m_xineStream, XINE_PARAM_AUDIO_AMP_LEVEL, vol*2); + else +@@ -2668,7 +2668,7 @@ void KXineWidget::slotSetVolume(int vol) + } + else + { +- //debugOut(TQString("Set audio mixer volume: %1").tqarg(vol)); ++ //debugOut(TQString("Set audio mixer volume: %1").arg(vol)); + xine_set_param(m_xineStream, XINE_PARAM_AUDIO_VOLUME, vol); + } + emit signalXineStatus(i18n("Volume") + ": " + TQString::number(vol) +"%"); +@@ -2872,7 +2872,7 @@ void KXineWidget::slotStop() + + void KXineWidget::slotSetAudiocdDevice(const TQString& device) + { +- debugOut(TQString("Set AudioCD device to %1").tqarg(device)); ++ debugOut(TQString("Set AudioCD device to %1").arg(device)); + + xine_cfg_entry_t config; + xine_config_lookup_entry(m_xineEngine, "input.cdda_device", &config); +@@ -2884,7 +2884,7 @@ void KXineWidget::slotSetAudiocdDevice(const TQString& device) + + void KXineWidget::slotSetVcdDevice(const TQString& device) + { +- debugOut(TQString("Set VCD device to %1").tqarg(device)); ++ debugOut(TQString("Set VCD device to %1").arg(device)); + + xine_cfg_entry_t config; + xine_config_lookup_entry(m_xineEngine, "input.vcd_device", &config); +@@ -2896,7 +2896,7 @@ void KXineWidget::slotSetVcdDevice(const TQString& device) + + void KXineWidget::slotSetDvdDevice(const TQString& device) + { +- debugOut(TQString("Set DVD device to %1").tqarg(device)); ++ debugOut(TQString("Set DVD device to %1").arg(device)); + + xine_cfg_entry_t config; + xine_config_lookup_entry(m_xineEngine, "input.dvd_device", &config); +@@ -2966,7 +2966,7 @@ void KXineWidget::setStreamSaveDir(const TQString& dir) + + if (!xine_config_lookup_entry(m_xineEngine, "misc.save_dir", &config)) return; /* older xine-lib */ + +- debugOut(TQString("Set misc.save_dir to: %1").tqarg(dir)); ++ debugOut(TQString("Set misc.save_dir to: %1").arg(dir)); + config.str_value = TQFile::encodeName(dir).data(); + xine_config_update_entry (m_xineEngine, &config); + } +@@ -2982,7 +2982,7 @@ const TQString KXineWidget::getStreamSaveDir() + + void KXineWidget::setBroadcasterPort(const uint port) + { +- debugOut(TQString("Set broadcaster port to %1").tqarg(port)); ++ debugOut(TQString("Set broadcaster port to %1").arg(port)); + xine_set_param(m_xineStream, XINE_PARAM_BROADCASTER_PORT, port); + } + +@@ -3018,7 +3018,7 @@ void KXineWidget::slotSpeedFaster() + { + xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_FAST_4); + m_currentSpeed = Fast2; +- emit signalXineStatus(i18n("Fast Forward %1").tqarg("x2")); ++ emit signalXineStatus(i18n("Fast Forward %1").arg("x2")); + break; + } + case Fast2: +@@ -3035,14 +3035,14 @@ void KXineWidget::slotSpeedFaster() + { + xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_SLOW_2); + m_currentSpeed = Slow1; +- emit signalXineStatus(i18n("Slow Motion %1").tqarg("x1")); ++ emit signalXineStatus(i18n("Slow Motion %1").arg("x1")); + break; + } + default: + { + xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_FAST_2); + m_currentSpeed = Fast1; +- emit signalXineStatus(i18n("Fast Forward %1").tqarg("x1")); ++ emit signalXineStatus(i18n("Fast Forward %1").arg("x1")); + break; + } + } +@@ -3056,7 +3056,7 @@ void KXineWidget::slotSpeedSlower() + { + xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_SLOW_4); + m_currentSpeed = Slow2; +- emit signalXineStatus(i18n("Slow Motion %1").tqarg("x2")); ++ emit signalXineStatus(i18n("Slow Motion %1").arg("x2")); + break; + } + case Slow2: +@@ -3073,14 +3073,14 @@ void KXineWidget::slotSpeedSlower() + { + xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_FAST_2); + m_currentSpeed = Fast1; +- emit signalXineStatus(i18n("Fast Forward %1").tqarg("x1")); ++ emit signalXineStatus(i18n("Fast Forward %1").arg("x1")); + break; + } + default: + { + xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_SLOW_2); + m_currentSpeed = Slow1; +- emit signalXineStatus(i18n("Slow Motion %1").tqarg("x1")); ++ emit signalXineStatus(i18n("Slow Motion %1").arg("x1")); + break; + } + } +@@ -3093,14 +3093,14 @@ TQString KXineWidget::getSupportedExtensions() const + + void KXineWidget::slotSetAudioChannel(int ch) + { +- debugOut(TQString("Switch to audio channel %1").tqarg(ch-1)); ++ debugOut(TQString("Switch to audio channel %1").arg(ch-1)); + xine_set_param(m_xineStream, XINE_PARAM_AUDIO_CHANNEL_LOGICAL, ch-1); + } + + + void KXineWidget::slotSetSubtitleChannel(int ch) + { +- debugOut(TQString("Switch to subtitle channel %1").tqarg(ch-1)); ++ debugOut(TQString("Switch to subtitle channel %1").arg(ch-1)); + xine_set_param(m_xineStream, XINE_PARAM_SPU_CHANNEL, ch-1); + } + +@@ -3306,7 +3306,7 @@ void KXineWidget::slotSetDeinterlaceConfig(const TQString& config) + if (m_deinterlaceFilter) + m_deinterlaceFilter->setConfig(config); + #else +- warningOut(TQString ("Not implemented [SetDeinterlaceConfig %1]").tqarg(config)); ++ warningOut(TQString ("Not implemented [SetDeinterlaceConfig %1]").arg(config)); + #endif + } + +@@ -3318,7 +3318,7 @@ void KXineWidget::slotToggleDeinterlace() + if (m_deinterlaceFilter) + { + m_deinterlaceEnabled = !m_deinterlaceEnabled; +- debugOut(TQString("Deinterlace enabled: %1").tqarg(m_deinterlaceEnabled)); ++ debugOut(TQString("Deinterlace enabled: %1").arg(m_deinterlaceEnabled)); + if ( m_deinterlaceEnabled ) s = i18n("Deinterlace: on"); + else s = i18n("Deinterlace: off"); + showOSDMessage( s, 2000 ); +@@ -3786,7 +3786,7 @@ TQImage KXineWidget::getScreenshot() const + else + height = (int)((double) height / scaleFactor + 0.5); + +- debugOut(TQString("Screenshot: scale picture from %1x%2 to %3x%4").tqarg(screenShot.width()).tqarg(screenShot.height()).tqarg(width).tqarg(height)); ++ debugOut(TQString("Screenshot: scale picture from %1x%2 to %3x%4").arg(screenShot.width()).arg(screenShot.height()).arg(width).arg(height)); + screenShot = screenShot.smoothScale(width, height); + + delete []rgbPile; +@@ -3849,7 +3849,7 @@ void KXineWidget::getScreenshot(uchar*& rgb32BitData, int& videoWidth, int& vide + break; + default: + { +- warningOut(TQString("Screenshot: Format %1 not supportet!").tqarg((char*)&format)); ++ warningOut(TQString("Screenshot: Format %1 not supportet!").arg((char*)&format)); + delete [] yuv; + return; + } +@@ -3880,7 +3880,7 @@ void KXineWidget::getScreenshot(uchar*& rgb32BitData, int& videoWidth, int& vide + desired_ratio = 4.0 / 3.0; + break; + default: +- warningOut(TQString("Screenshot: Unknown aspect ratio: %1 - using 4:3").tqarg(ratio)); ++ warningOut(TQString("Screenshot: Unknown aspect ratio: %1 - using 4:3").arg(ratio)); + case XINE_VO_ASPECT_STQUARE: + debugOut("Screenshot: got video aspect: 1:1"); + desired_ratio = image_ratio; +@@ -3888,7 +3888,7 @@ void KXineWidget::getScreenshot(uchar*& rgb32BitData, int& videoWidth, int& vide + } + */ + +- debugOut(TQString("Screenshot: using scale factor: %1").tqarg(m_videoAspect)); ++ debugOut(TQString("Screenshot: using scale factor: %1").arg(m_videoAspect)); + scaleFactor = m_videoAspect; + + delete [] yuv; +diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp +index f9b3fb1..1b9c123 100644 +--- a/kaffeine/src/player-parts/xine-part/xine_part.cpp ++++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp +@@ -304,7 +304,7 @@ void XinePart::slotPlay(bool forcePlay) + { + TQString sub; + if ((!mrl.subtitleFiles().isEmpty()) && (mrl.currentSubtitle() > -1)) +- sub = TQString("#subtitle:%1").tqarg(mrl.subtitleFiles()[mrl.currentSubtitle()]); ++ sub = TQString("#subtitle:%1").arg(mrl.subtitleFiles()[mrl.currentSubtitle()]); + + m_xine->clearQueue(); + m_xine->appendToQueue(mrl.url() + sub ); +@@ -786,7 +786,7 @@ void XinePart::slotNewPosition(int pos, const TQTime& playtime) + } + else + { +- timeMessage = i18n("%1 of %2").tqarg(calcLength.toString("h:mm:ss")).tqarg(length.toString("h:mm:ss")); ++ timeMessage = i18n("%1 of %2").arg(calcLength.toString("h:mm:ss")).arg(length.toString("h:mm:ss")); + m_xine->showOSDMessage(timeMessage, 600, OSD_MESSAGE_LOW_PRIORITY); + } + } +@@ -1623,7 +1623,7 @@ void XinePart::audiocdMRLS(MRL::List& mrls, bool& ok, bool& supported, const TQS + for (uint i = 0; i < list.count(); i++) + { + mrl = MRL(list[i]); +- mrl.setTitle(i18n("AudioCD Track %1").tqarg(i+1)); ++ mrl.setTitle(i18n("AudioCD Track %1").arg(i+1)); + mrl.setTrack(TQString::number(i+1)); + if (xine_open(xineStreamForMeta, TQFile::encodeName(mrl.url()))) + { +@@ -1698,7 +1698,7 @@ void XinePart::vcdMRLS(MRL::List& mrls, bool& ok, bool& supported, const TQStrin + mrl = MRL(list[i]); + mrl.setMime("video/vcd"); + mrl.setTrack(TQString::number(i+1)); +- mrl.setTitle(i18n("VCD Track %1").tqarg(i+1)); ++ mrl.setTitle(i18n("VCD Track %1").arg(i+1)); + mrls.append(mrl); + } + if (mrls.count()) +diff --git a/kaffeine/src/player-parts/xine-part/xineconfig.cpp b/kaffeine/src/player-parts/xine-part/xineconfig.cpp +index 74076e4..6d6a2d4 100644 +--- a/kaffeine/src/player-parts/xine-part/xineconfig.cpp ++++ b/kaffeine/src/player-parts/xine-part/xineconfig.cpp +@@ -272,7 +272,7 @@ XineConfig::XineConfig(const xine_t* const xine) : + else + icon = "edit"; + +- xineFrame = addPage(*it, i18n("%1 Options").tqarg(*it), KGlobal::iconLoader()->loadIcon(icon, KIcon::Panel, ++ xineFrame = addPage(*it, i18n("%1 Options").arg(*it), KGlobal::iconLoader()->loadIcon(icon, KIcon::Panel, + KIcon::SizeMedium)); + xineLayout = new TQVBoxLayout(xineFrame, marginHint(), spacingHint()); + tabWidget = new TQTabWidget(xineFrame); +diff --git a/kaffeine/src/startwindow.cpp b/kaffeine/src/startwindow.cpp +index a86696e..67948a9 100644 +--- a/kaffeine/src/startwindow.cpp ++++ b/kaffeine/src/startwindow.cpp +@@ -113,7 +113,7 @@ void StartWindow::registerTarget( const TQString& uiName, const TQString& pixNam + //f.setPointSize( f.pointSize()+2 ); + //f.setBold(true); + //btn->setFont( f ); +- btn->setTextLabel( TQString("&%1 %2").tqarg(buttons.count() + 1).tqarg(uiName)); ++ btn->setTextLabel( TQString("&%1 %2").arg(buttons.count() + 1).arg(uiName)); + TQToolTip::add(btn, uiName); + btn->setTextPosition( TQToolButton::Under ); + btn->setUsesTextLabel( true ); diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13-rename_obsolete_tq_methods.patch b/redhat/applications/kaffeine/kaffeine-3.5.13-rename_obsolete_tq_methods.patch new file mode 100644 index 000000000..a60af902e --- /dev/null +++ b/redhat/applications/kaffeine/kaffeine-3.5.13-rename_obsolete_tq_methods.patch @@ -0,0 +1,643 @@ +commit 66805bafb9e1db535090dd74f6bdc56c2ac431c0 +Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Date: 1324497848 -0600 + + Rename obsolete tq methods to standard names + +diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp +index e67603e..c48cf28 100644 +--- a/kaffeine/src/input/audiobrowser/playlist.cpp ++++ b/kaffeine/src/input/audiobrowser/playlist.cpp +@@ -169,10 +169,10 @@ struct CoverPopup : public TQWidget + CoverPopup(const TQPixmap &image, const TQPoint &p) : + TQWidget(0, 0, WDestructiveClose | WX11BypassWM) + { +- TQHBoxLayout *tqlayout = new TQHBoxLayout(this); ++ TQHBoxLayout *layout = new TQHBoxLayout(this); + TQLabel *label = new TQLabel(this); + +- tqlayout->addWidget(label); ++ layout->addWidget(label); + label->setFrameStyle(TQFrame::Box | TQFrame::Raised); + label->setLineWidth(1); + label->setPixmap(image); +@@ -342,7 +342,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) : + KIO::NetAccess::mkdir(m_playlistDirectory, mainWidget); + kdDebug() << "PLAYLIST" << endl; + +- TQGridLayout* tqlayout = new TQGridLayout( playlist, 4, 2, 3 ); ++ TQGridLayout* layout = new TQGridLayout( playlist, 4, 2, 3 ); + + m_list = new UrlListView(playlist); + mainWidget->setAcceptDrops(true); +@@ -379,12 +379,12 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) : + m_list->setRenameable(TRACK_COLUMN); + m_list->setAllColumnsShowFocus(true); + m_list->setShowSortIndicator(true); +- tqlayout->addMultiCellWidget(m_list, 3, 3, 0, 1); ++ layout->addMultiCellWidget(m_list, 3, 3, 0, 1); + + coverFrame = new CoverFrame( playlist ); + coverFrame->setFixedWidth( 80 ); + coverFrame->setFixedHeight( 80 ); +- tqlayout->addMultiCellWidget(coverFrame, 0, 2, 0, 0); ++ layout->addMultiCellWidget(coverFrame, 0, 2, 0, 0); + + TQHBoxLayout *h1 = new TQHBoxLayout(); + searchBtn = new TQToolButton( playlist ); +@@ -397,7 +397,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) : + m_playlistFilter = new KLineEdit(playlist); + m_playlistFilter->setFocusPolicy(TQ_ClickFocus); + h1->addWidget(m_playlistFilter); +- tqlayout->addLayout( h1, 2, 1 ); ++ layout->addLayout( h1, 2, 1 ); + + TQHBoxLayout *h2 = new TQHBoxLayout(); + TQLabel* playlistLabel = new TQLabel(i18n("Playlist:"), playlist); +@@ -410,10 +410,10 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) : + m_playlistSelector->setFocusPolicy(TQ_ClickFocus); + TQToolTip::add(m_playlistSelector, i18n("Select the active playlist. To change playlist name edit it and confirm with 'Return'.")); + h2->addWidget(m_playlistSelector); +- tqlayout->addLayout( h2, 1, 1 ); ++ layout->addLayout( h2, 1, 1 ); + + roller = new RollTitle( playlist ); +- tqlayout->addWidget( roller, 0, 1 ); ++ layout->addWidget( roller, 0, 1 ); + + KAccel* accel = new KAccel(mainWidget); + accel->insert("Delete selected", TQt::Key_Delete, this, TQT_SLOT(slotRemoveSelected())); +@@ -2145,7 +2145,7 @@ void PlayList::slotPaste() + + TQStrList list; + +- if (TQUriDrag::decode(TQApplication::tqclipboard()->data(), list)) ++ if (TQUriDrag::decode(TQApplication::clipboard()->data(), list)) + { + TQStringList urls; + for (TQStrListIterator it(list); *it; ++it) +@@ -2155,7 +2155,7 @@ void PlayList::slotPaste() + } + /** try to decode as text **/ + TQString text; +- if (TQTextDrag::decode(TQApplication::tqclipboard()->data(), text)) ++ if (TQTextDrag::decode(TQApplication::clipboard()->data(), text)) + { + add(text, lastSelected); + } +@@ -2173,7 +2173,7 @@ void PlayList::slotCopy() + urlList.append(TQUriDrag::unicodeUriToUri(dynamic_cast<PlaylistItem *>(selected.at(i))->url())); + } + +- TQApplication::tqclipboard()->setData(new TQUriDrag(urlList)); ++ TQApplication::clipboard()->setData(new TQUriDrag(urlList)); + } + + void PlayList::slotSelectAll() +diff --git a/kaffeine/src/input/disc/paranoiasettings.ui b/kaffeine/src/input/disc/paranoiasettings.ui +index 1d163d3..30bbe54 100644 +--- a/kaffeine/src/input/disc/paranoiasettings.ui ++++ b/kaffeine/src/input/disc/paranoiasettings.ui +@@ -24,7 +24,7 @@ + </property> + <widget class="TQLayoutWidget" row="0" column="0"> + <property name="name"> +- <cstring>tqlayout3</cstring> ++ <cstring>layout3</cstring> + </property> + <vbox> + <property name="name"> +@@ -174,7 +174,7 @@ + </spacer> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout8</cstring> ++ <cstring>layout8</cstring> + </property> + <hbox> + <property name="name"> +diff --git a/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui b/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui +index d956e5b..03485cf 100644 +--- a/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui ++++ b/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui +@@ -24,7 +24,7 @@ + </property> + <widget class="TQLayoutWidget" row="0" column="0"> + <property name="name"> +- <cstring>tqlayout5</cstring> ++ <cstring>layout5</cstring> + </property> + <vbox> + <property name="name"> +@@ -51,7 +51,7 @@ + </widget> + <widget class="TQLayoutWidget" row="0" column="0"> + <property name="name"> +- <cstring>tqlayout7</cstring> ++ <cstring>layout7</cstring> + </property> + <hbox> + <property name="name"> +@@ -117,7 +117,7 @@ + </spacer> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout4</cstring> ++ <cstring>layout4</cstring> + </property> + <hbox> + <property name="name"> +diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui b/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui +index b243300..f414545 100644 +--- a/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui ++++ b/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui +@@ -24,7 +24,7 @@ + </property> + <widget class="TQLayoutWidget" row="0" column="0"> + <property name="name"> +- <cstring>tqlayout9</cstring> ++ <cstring>layout9</cstring> + </property> + <vbox> + <property name="name"> +@@ -107,7 +107,7 @@ + </spacer> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout7</cstring> ++ <cstring>layout7</cstring> + </property> + <hbox> + <property name="name"> +diff --git a/kaffeine/src/input/dvb/audioeditorui.ui b/kaffeine/src/input/dvb/audioeditorui.ui +index 1131eec..ab94806 100644 +--- a/kaffeine/src/input/dvb/audioeditorui.ui ++++ b/kaffeine/src/input/dvb/audioeditorui.ui +@@ -21,7 +21,7 @@ + </property> + <widget class="TQLayoutWidget" row="0" column="0"> + <property name="name"> +- <cstring>tqlayout24</cstring> ++ <cstring>layout24</cstring> + </property> + <vbox> + <property name="name"> +@@ -29,7 +29,7 @@ + </property> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout23</cstring> ++ <cstring>layout23</cstring> + </property> + <hbox> + <property name="name"> +@@ -60,7 +60,7 @@ + </widget> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout21</cstring> ++ <cstring>layout21</cstring> + </property> + <vbox> + <property name="name"> +@@ -68,7 +68,7 @@ + </property> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout16</cstring> ++ <cstring>layout16</cstring> + </property> + <hbox> + <property name="name"> +@@ -76,7 +76,7 @@ + </property> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout15</cstring> ++ <cstring>layout15</cstring> + </property> + <vbox> + <property name="name"> +@@ -146,7 +146,7 @@ + </spacer> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout14</cstring> ++ <cstring>layout14</cstring> + </property> + <hbox> + <property name="name"> +@@ -154,7 +154,7 @@ + </property> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout13</cstring> ++ <cstring>layout13</cstring> + </property> + <vbox> + <property name="name"> +@@ -258,7 +258,7 @@ + </widget> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout19</cstring> ++ <cstring>layout19</cstring> + </property> + <hbox> + <property name="name"> +diff --git a/kaffeine/src/input/dvb/camdialog.ui b/kaffeine/src/input/dvb/camdialog.ui +index 9463cee..c255575 100644 +--- a/kaffeine/src/input/dvb/camdialog.ui ++++ b/kaffeine/src/input/dvb/camdialog.ui +@@ -21,7 +21,7 @@ + </property> + <widget class="TQLayoutWidget" row="0" column="0"> + <property name="name"> +- <cstring>tqlayout5</cstring> ++ <cstring>layout5</cstring> + </property> + <vbox> + <property name="name"> +@@ -29,7 +29,7 @@ + </property> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout5</cstring> ++ <cstring>layout5</cstring> + </property> + <hbox> + <property name="name"> +diff --git a/kaffeine/src/input/dvb/cammenudialog.ui b/kaffeine/src/input/dvb/cammenudialog.ui +index f6b5a00..022993a 100644 +--- a/kaffeine/src/input/dvb/cammenudialog.ui ++++ b/kaffeine/src/input/dvb/cammenudialog.ui +@@ -21,7 +21,7 @@ + </property> + <widget class="TQLayoutWidget" row="0" column="0"> + <property name="name"> +- <cstring>tqlayout7</cstring> ++ <cstring>layout7</cstring> + </property> + <vbox> + <property name="name"> +@@ -34,7 +34,7 @@ + </widget> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout6</cstring> ++ <cstring>layout6</cstring> + </property> + <hbox> + <property name="name"> +diff --git a/kaffeine/src/input/dvb/channeleditorui.ui b/kaffeine/src/input/dvb/channeleditorui.ui +index ceb3d62..add07e2 100644 +--- a/kaffeine/src/input/dvb/channeleditorui.ui ++++ b/kaffeine/src/input/dvb/channeleditorui.ui +@@ -35,7 +35,7 @@ + </widget> + <widget class="TQLayoutWidget" row="0" column="0"> + <property name="name"> +- <cstring>tqlayout7</cstring> ++ <cstring>layout7</cstring> + </property> + <vbox> + <property name="name"> +@@ -43,7 +43,7 @@ + </property> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout8</cstring> ++ <cstring>layout8</cstring> + </property> + <hbox> + <property name="name"> +@@ -83,7 +83,7 @@ + </widget> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout5</cstring> ++ <cstring>layout5</cstring> + </property> + <hbox> + <property name="name"> +@@ -138,7 +138,7 @@ + </widget> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout6</cstring> ++ <cstring>layout6</cstring> + </property> + <hbox> + <property name="name"> +@@ -261,7 +261,7 @@ + </property> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout7</cstring> ++ <cstring>layout7</cstring> + </property> + <grid> + <property name="name"> +@@ -642,7 +642,7 @@ + </spacer> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout14</cstring> ++ <cstring>layout14</cstring> + </property> + <hbox> + <property name="name"> +diff --git a/kaffeine/src/input/dvb/crontimerui.ui b/kaffeine/src/input/dvb/crontimerui.ui +index 87baff7..5441bee 100644 +--- a/kaffeine/src/input/dvb/crontimerui.ui ++++ b/kaffeine/src/input/dvb/crontimerui.ui +@@ -21,7 +21,7 @@ + </property> + <widget class="TQLayoutWidget" row="0" column="0"> + <property name="name"> +- <cstring>tqlayout13</cstring> ++ <cstring>layout13</cstring> + </property> + <vbox> + <property name="name"> +@@ -29,7 +29,7 @@ + </property> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout12</cstring> ++ <cstring>layout12</cstring> + </property> + <hbox> + <property name="name"> +@@ -54,7 +54,7 @@ + </spacer> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout11</cstring> ++ <cstring>layout11</cstring> + </property> + <vbox> + <property name="name"> +@@ -271,7 +271,7 @@ + </spacer> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout9</cstring> ++ <cstring>layout9</cstring> + </property> + <grid> + <property name="name"> +diff --git a/kaffeine/src/input/dvb/scandialogui.ui b/kaffeine/src/input/dvb/scandialogui.ui +index dbcff8b..654e762 100644 +--- a/kaffeine/src/input/dvb/scandialogui.ui ++++ b/kaffeine/src/input/dvb/scandialogui.ui +@@ -21,7 +21,7 @@ + </property> + <widget class="TQLayoutWidget" row="0" column="0"> + <property name="name"> +- <cstring>tqlayout9</cstring> ++ <cstring>layout9</cstring> + </property> + <vbox> + <property name="name"> +@@ -29,7 +29,7 @@ + </property> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout8</cstring> ++ <cstring>layout8</cstring> + </property> + <hbox> + <property name="name"> +@@ -129,7 +129,7 @@ + </widget> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout7</cstring> ++ <cstring>layout7</cstring> + </property> + <vbox> + <property name="name"> +@@ -487,7 +487,7 @@ + </widget> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout9</cstring> ++ <cstring>layout9</cstring> + </property> + <hbox> + <property name="name"> +diff --git a/kaffeine/src/input/dvb/subeditorui.ui b/kaffeine/src/input/dvb/subeditorui.ui +index fb8d391..857cdc5 100644 +--- a/kaffeine/src/input/dvb/subeditorui.ui ++++ b/kaffeine/src/input/dvb/subeditorui.ui +@@ -35,7 +35,7 @@ + </widget> + <widget class="TQLayoutWidget" row="2" column="0"> + <property name="name"> +- <cstring>tqlayout19</cstring> ++ <cstring>layout19</cstring> + </property> + <hbox> + <property name="name"> +@@ -70,7 +70,7 @@ + </widget> + <widget class="TQLayoutWidget" row="0" column="0"> + <property name="name"> +- <cstring>tqlayout13</cstring> ++ <cstring>layout13</cstring> + </property> + <hbox> + <property name="name"> +@@ -101,7 +101,7 @@ + </widget> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout12</cstring> ++ <cstring>layout12</cstring> + </property> + <vbox> + <property name="name"> +@@ -109,7 +109,7 @@ + </property> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout16</cstring> ++ <cstring>layout16</cstring> + </property> + <hbox> + <property name="name"> +@@ -117,7 +117,7 @@ + </property> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout15</cstring> ++ <cstring>layout15</cstring> + </property> + <vbox> + <property name="name"> +@@ -187,7 +187,7 @@ + </spacer> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout11</cstring> ++ <cstring>layout11</cstring> + </property> + <hbox> + <property name="name"> +@@ -195,7 +195,7 @@ + </property> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout13</cstring> ++ <cstring>layout13</cstring> + </property> + <vbox> + <property name="name"> +@@ -232,7 +232,7 @@ + </property> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout10</cstring> ++ <cstring>layout10</cstring> + </property> + <vbox> + <property name="name"> +@@ -274,7 +274,7 @@ + </widget> + <widget class="TQLayoutWidget"> + <property name="name"> +- <cstring>tqlayout9</cstring> ++ <cstring>layout9</cstring> + </property> + <vbox> + <property name="name"> +diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp +index 9efebc9..10bd4be 100644 +--- a/kaffeine/src/kaffeine.cpp ++++ b/kaffeine/src/kaffeine.cpp +@@ -1591,7 +1591,7 @@ void Kaffeine::slotFakeKeyEvent() + } + } + +-/** slots for meta to tqunicode encoding **/ ++/** slots for meta to unicode encoding **/ + + void Kaffeine::slotUseAlternateEncoding(bool useEncoding) + { +diff --git a/kaffeine/src/kmultitabbar.cpp b/kaffeine/src/kmultitabbar.cpp +index ecfa2c5..4ff1154 100644 +--- a/kaffeine/src/kmultitabbar.cpp ++++ b/kaffeine/src/kmultitabbar.cpp +@@ -474,7 +474,7 @@ TQSize KMultiTabBarButton::sizeHint() const + } + #endif + if ( isMenuButton() ) +- w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this); ++ w += style().pixelMetric(TQStyle::PM_MenuButtonIndicator, this); + + if ( pixmap() ) { + TQPixmap *pm = (TQPixmap *)pixmap(); +@@ -493,7 +493,7 @@ TQSize KMultiTabBarButton::sizeHint() const + h = TQMAX(h, sz.height()); + } + +- return (tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). ++ return (style().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). + expandedTo(TQApplication::globalStrut())); + } + +diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp +index dd843f5..ccb56f3 100644 +--- a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp ++++ b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp +@@ -40,47 +40,47 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin + setInitialSize(TQSize(400,300), true); + + TQFrame* frame = NULL; +- TQGridLayout* tqlayout = NULL; ++ TQGridLayout* layout = NULL; + TQLabel* label = NULL; + + //Audio Page + frame = addPage(i18n("Audio"), i18n("Audio Options"), KGlobal::iconLoader()->loadIcon("sound", KIcon::Panel, + KIcon::SizeMedium)); +- tqlayout = new TQGridLayout(frame, 10, 2); +- tqlayout->setMargin(10); +- tqlayout->setSpacing(10); ++ layout = new TQGridLayout(frame, 10, 2); ++ layout->setMargin(10); ++ layout->setSpacing(10); + m_audioDriverBox = new KComboBox(frame); + m_audioDriverBox->insertStringList(audioDrivers); + label = new TQLabel(i18n("Prefered audio driver"), frame); +- tqlayout->addWidget(label, 1, 0); +- tqlayout->addWidget(m_audioDriverBox, 1, 1); +- tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); ++ layout->addWidget(label, 1, 0); ++ layout->addWidget(m_audioDriverBox, 1, 1); ++ layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); + + //Video Page + frame = addPage(i18n("Video"), i18n("Video Options"), KGlobal::iconLoader()->loadIcon("video", KIcon::Panel, + KIcon::SizeMedium)); +- tqlayout = new TQGridLayout(frame, 10, 2); +- tqlayout->setMargin(10); +- tqlayout->setSpacing(10); ++ layout = new TQGridLayout(frame, 10, 2); ++ layout->setMargin(10); ++ layout->setSpacing(10); + m_videoDriverBox = new KComboBox(frame); + m_videoDriverBox->insertStringList(videoDrivers); + label = new TQLabel(i18n("Prefered video driver")+ "*", frame); +- tqlayout->addWidget(label, 1, 0); +- tqlayout->addWidget(m_videoDriverBox, 1, 1); +- tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); +- tqlayout->addWidget(new TQLabel(TQString("<small>") + i18n("* Restart required!") + "</small>", frame), 10, 1); ++ layout->addWidget(label, 1, 0); ++ layout->addWidget(m_videoDriverBox, 1, 1); ++ layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); ++ layout->addWidget(new TQLabel(TQString("<small>") + i18n("* Restart required!") + "</small>", frame), 10, 1); + + //Media page + frame = addPage(i18n("Media"), i18n("Media Options"), KGlobal::iconLoader()->loadIcon("cdrom_unmount", KIcon::Panel, + KIcon::SizeMedium)); +- tqlayout = new TQGridLayout(frame, 10, 2); +- tqlayout->setMargin(10); +- tqlayout->setSpacing(10); ++ layout = new TQGridLayout(frame, 10, 2); ++ layout->setMargin(10); ++ layout->setSpacing(10); + m_driveEdit = new KLineEdit(frame); + label = new TQLabel(i18n("CD, VCD, DVD drive"), frame); +- tqlayout->addWidget(label, 1, 0); +- tqlayout->addWidget(m_driveEdit, 1, 1); +- tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); ++ layout->addWidget(label, 1, 0); ++ layout->addWidget(m_driveEdit, 1, 1); ++ layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); + } + + GStreamerConfig::~GStreamerConfig() +diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp +index 1b9c123..98ff969 100644 +--- a/kaffeine/src/player-parts/xine-part/xine_part.cpp ++++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp +@@ -212,7 +212,7 @@ bool XinePart::openURL(const MRL& mrl) + if (firstLine.contains("smil", false)) + { + kdDebug() << "XinePart: Try loading smil playlist\n"; +- if (KMessageBox::warningYesNo(0, i18n("SMIL (Synchronized Multimedia Integration Language) support is rudimentary!\nXinePart can now try to playback contained video sources without any tqlayout. Proceed?"), TQString(), KStdGuiItem::yes(), KStdGuiItem::no(), "smil_warning") == KMessageBox::Yes) ++ if (KMessageBox::warningYesNo(0, i18n("SMIL (Synchronized Multimedia Integration Language) support is rudimentary!\nXinePart can now try to playback contained video sources without any layout. Proceed?"), TQString(), KStdGuiItem::yes(), KStdGuiItem::no(), "smil_warning") == KMessageBox::Yes) + { + if (!PlaylistImport::smil(localFile, m_mrl, m_playlist)) + { +@@ -1240,7 +1240,7 @@ void XinePart::slotInfo() + if (m_xine->hasSaveURL()) + ts << "<tr><td><b>" << i18n("Save Stream as") << ":</b></td><td> " << m_xine->getSaveURL() << "</td></tr>"; + +- ts << "<tr><td></td><td></td></tr>"; // added for better tqlayout ++ ts << "<tr><td></td><td></td></tr>"; // added for better layout + ts << "</table></qt>"; + KMessageBox::information(0, info, i18n("Track info") ); + } diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13-rename_old_tq_methods.patch b/redhat/applications/kaffeine/kaffeine-3.5.13-rename_old_tq_methods.patch new file mode 100644 index 000000000..84d5945b8 --- /dev/null +++ b/redhat/applications/kaffeine/kaffeine-3.5.13-rename_old_tq_methods.patch @@ -0,0 +1,2103 @@ +commit 60ed202f8065829574473fdfc20f53281d274ceb +Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Date: 1324253348 -0600 + + Rename old tq methods that no longer need a unique name + +diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp +index 9c418a1..3735b61 100644 +--- a/kaffeine/src/input/audiobrowser/playlist.cpp ++++ b/kaffeine/src/input/audiobrowser/playlist.cpp +@@ -75,14 +75,14 @@ + + RollTitle::RollTitle( TQWidget *parent ) : TQLabel( "I", parent ) + { +- TQColorGroup cg = parentWidget()->tqcolorGroup(); ++ TQColorGroup cg = parentWidget()->colorGroup(); + TQColor base = cg.base(); + TQColor selection = cg.highlight(); + int r = (base.red() + selection.red()) / 2; + int b = (base.blue() + selection.blue()) / 2; + int g = (base.green() + selection.green()) / 2; + back = TQColor(r, g, b); +- fore = parentWidget()->tqcolorGroup().text(); ++ fore = parentWidget()->colorGroup().text(); + setPaletteBackgroundColor( back ); + setPaletteForegroundColor( fore ); + setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); +@@ -115,7 +115,7 @@ void RollTitle::setTitle( TQString t ) + { + TQLabel *lab = new TQLabel( t, this ); + lab->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); +- lab->resize( lab->tqsizeHint() ); ++ lab->resize( lab->sizeHint() ); + int x = 2*lab->frameWidth(); + titlePix = TQPixmap( lab->width()-x, height()-x, -1, TQPixmap::BestOptim ); + delete lab; +@@ -149,7 +149,7 @@ void RollTitle::rollTitle() + void RollTitle::paintEvent( TQPaintEvent *pe ) + { + TQLabel::paintEvent( pe ); +- TQColorGroup cg = parentWidget()->tqcolorGroup(); ++ TQColorGroup cg = parentWidget()->colorGroup(); + TQColor base = cg.base(); + TQColor selection = cg.highlight(); + int r = (base.red() + selection.red()) / 2; +@@ -157,7 +157,7 @@ void RollTitle::paintEvent( TQPaintEvent *pe ) + int g = (base.green() + selection.green()) / 2; + back=TQColor(r,g,b); + setPaletteBackgroundColor( back ); +- fore = parentWidget()->tqcolorGroup().text(); ++ fore = parentWidget()->colorGroup().text(); + setPaletteForegroundColor( fore ); + setTitle( title ); + } +@@ -283,7 +283,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) : + google = NULL; + + mainWidget = new TQVBox( parent ); +- //mainWidget->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) ); ++ //mainWidget->setSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) ); + hSplit = new TQSplitter( mainWidget ); + hSplit->setOpaqueResize( true ); + panel = new TQVBox( hSplit ); +@@ -404,7 +404,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) : + h2->addWidget(playlistLabel); + m_playlistSelector = new KComboBox( playlist ); + m_playlistSelector->setMinimumWidth(10); +- m_playlistSelector->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred) ); ++ m_playlistSelector->setSizePolicy( TQSizePolicy (TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred) ); + m_playlistSelector->setEditable(true); + m_playlistSelector->setDuplicatesEnabled(false); + m_playlistSelector->setFocusPolicy(TQ_ClickFocus); +@@ -706,7 +706,7 @@ MRL PlayList::getCurrent() + if (isQueueMode()) + { + m_queue.clear(); +- updatetqStatus(); ++ updateStatus(); + } + + if (m_random) +@@ -747,7 +747,7 @@ bool PlayList::nextTrack( MRL &mrl ) + { + mrl = m_queue.first(); + m_queue.remove(m_queue.begin()); +- updatetqStatus(); ++ updateStatus(); + return true; + } + +@@ -802,7 +802,7 @@ bool PlayList::previousTrack( MRL &mrl ) + if (isQueueMode()) + { + m_queue.clear(); +- updatetqStatus(); ++ updateStatus(); + } + + if (!m_currentEntry) { +@@ -1349,7 +1349,7 @@ void PlayList::add(const TQStringList& urlList, TQListViewItem* after) + + delete progress; + if (m_random) createRandomList(); +- updatetqStatus(); ++ updateStatus(); + } + + void PlayList::add(const TQValueList<MRL>& mrlList, TQListViewItem* after) +@@ -1357,7 +1357,7 @@ void PlayList::add(const TQValueList<MRL>& mrlList, TQListViewItem* after) + TQValueList<MRL>::ConstIterator end(mrlList.end()); + for (TQValueList<MRL>::ConstIterator it = mrlList.begin(); it != end; ++it) + after = insertItem(after, *it); +- updatetqStatus(); ++ updateStatus(); + if (m_random) createRandomList(); + } + +@@ -1419,7 +1419,7 @@ void PlayList::clearList() + m_playlistFilter->clear(); + m_searchSelection = false; + } +- updatetqStatus(); ++ updateStatus(); + m_currentEntry = NULL; + m_currentRandomListEntry = -1; + } +@@ -1435,7 +1435,7 @@ void PlayList::slotDropEvent(TQDropEvent* dev, TQListViewItem* after) + { + for (uint i=0; i < urls.count() ;i++) + { +- //KURL url(TQUriDrag::tqunicodeUriToUri(urls[i])); ++ //KURL url(TQUriDrag::unicodeUriToUri(urls[i])); + //newurls << url.path(-1); + //kdDebug() << "PlayList: Dropped " << url.path() << endl; + newurls << urls[i]; +@@ -1453,7 +1453,7 @@ void PlayList::slotDropEvent(TQDropEvent* dev, TQListViewItem* after) + else + if (strcmp(dev->format(), "text/x-moz-url") == 0) /* for mozilla drops */ + { +- TQByteArray data = dev->tqencodedData("text/plain"); ++ TQByteArray data = dev->encodedData("text/plain"); + TQString md(data); + add(md, after); + } +@@ -1602,7 +1602,7 @@ void PlayList::mergeMeta(const MRL& mrl) + if (tmp->isVisible()) + m_playTimeVisible += timeStringToMs(tmp->length()); + +- updatetqStatus(); ++ updateStatus(); + } + } + +@@ -1762,10 +1762,10 @@ void PlayList::slotRemoveSelected() + } + + if (m_random) createRandomList(); +- updatetqStatus(); ++ updateStatus(); + } + +-void PlayList::updatetqStatus() ++void PlayList::updateStatus() + { + TQString status; + if (isQueueMode()) +@@ -2121,7 +2121,7 @@ void PlayList::slotFindText(const TQString& text) + m_searchSelection = true; + + if (m_random) createRandomList(); +- updatetqStatus(); ++ updateStatus(); + } + + +@@ -2170,7 +2170,7 @@ void PlayList::slotCopy() + + for (uint i=0; i<selected.count(); i++) + { +- urlList.append(TQUriDrag::tqunicodeUriToUri(dynamic_cast<PlaylistItem *>(selected.at(i))->url())); ++ urlList.append(TQUriDrag::unicodeUriToUri(dynamic_cast<PlaylistItem *>(selected.at(i))->url())); + } + + TQApplication::tqclipboard()->setData(new TQUriDrag(urlList)); +@@ -2209,7 +2209,7 @@ void PlayList::slotPlaylistFromSelected() + void PlayList::slotAddToQueue(MRL mrl) + { + m_queue.append(mrl); +- updatetqStatus(); ++ updateStatus(); + } + + /**** helper ****/ +diff --git a/kaffeine/src/input/audiobrowser/playlist.h b/kaffeine/src/input/audiobrowser/playlist.h +index 7f0a89a..7be7a6d 100644 +--- a/kaffeine/src/input/audiobrowser/playlist.h ++++ b/kaffeine/src/input/audiobrowser/playlist.h +@@ -239,7 +239,7 @@ private slots: + + private: + TQListViewItem* insertItem(TQListViewItem* after, const MRL&); +- void updatetqStatus(); ++ void updateStatus(); + void createRandomList(); + void getMetaInfo(MRL& mrl, const TQString& mimeName); + void setupActions(); +diff --git a/kaffeine/src/input/audiobrowser/playlistitem.cpp b/kaffeine/src/input/audiobrowser/playlistitem.cpp +index 813f5c2..fe5a494 100644 +--- a/kaffeine/src/input/audiobrowser/playlistitem.cpp ++++ b/kaffeine/src/input/audiobrowser/playlistitem.cpp +@@ -249,10 +249,10 @@ void PlaylistItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, i + { + if (isCurrent) + { +- TQColorGroup tqcolorGroup = cg; ++ TQColorGroup colorGroup = cg; + +- TQColor base = tqcolorGroup.base(); +- TQColor selection = tqcolorGroup.highlight(); ++ TQColor base = colorGroup.base(); ++ TQColor selection = colorGroup.highlight(); + + int r = (base.red() + selection.red()) / 2; + int b = (base.blue() + selection.blue()) / 2; +@@ -260,8 +260,8 @@ void PlaylistItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, i + + TQColor c(r, g, b); + +- tqcolorGroup.setColor(TQColorGroup::Base, c); +- TQListViewItem::paintCell(p, tqcolorGroup, column, width, align); ++ colorGroup.setColor(TQColorGroup::Base, c); ++ TQListViewItem::paintCell(p, colorGroup, column, width, align); + } + else + return KListViewItem::paintCell(p, cg, column, width, align); +diff --git a/kaffeine/src/input/disc/disc.cpp b/kaffeine/src/input/disc/disc.cpp +index 62dc3a5..e392dca 100644 +--- a/kaffeine/src/input/disc/disc.cpp ++++ b/kaffeine/src/input/disc/disc.cpp +@@ -50,7 +50,7 @@ MLabel::MLabel( TQWidget *parent ) : TQLabel( parent ) + void MLabel::paintEvent( TQPaintEvent *pe ) + { + TQLabel::paintEvent( pe ); +- TQColorGroup cg = parentWidget()->tqcolorGroup(); ++ TQColorGroup cg = parentWidget()->colorGroup(); + TQColor base = cg.base(); + TQColor selection = cg.highlight(); + int r = (base.red() + selection.red()) / 2; +@@ -76,22 +76,22 @@ void MListView::resizeEvent( TQResizeEvent *rev ) + Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : KaffeineInput(objParent , name) + { + mainWidget = new TQVBox( parent ); +- mainWidget->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred) ); ++ mainWidget->setSizePolicy( TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred) ); + split = new TQSplitter( mainWidget ); + split->setOpaqueResize( true ); + widg = new TQWidget( split ); + widg->setMinimumWidth( 200 ); +- widg->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) ); ++ widg->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) ); + TQVBoxLayout *wb = new TQVBoxLayout( widg, 0, 0 ); + discLab = new MLabel( widg ); + wb->addWidget( discLab ); + playerBox = new TQVBox( widg ); + wb->addWidget( playerBox ); + playerBox->setMinimumWidth( 200 ); +- playerBox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) ); ++ playerBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) ); + panel = new TQFrame( split ); + split->moveToFirst( panel ); +- panel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) ); ++ panel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) ); + split->setResizeMode( panel, TQSplitter::KeepSize ); + + TQVBoxLayout *vb = new TQVBoxLayout( panel, 3, 3 ); +@@ -99,13 +99,13 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine + cdBtn->setTextLabel( i18n("Play CD") ); + cdBtn->setTextPosition( TQToolButton::Under ); + cdBtn->setUsesTextLabel( true ); +- cdBtn->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); ++ cdBtn->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); + TQToolTip::add( cdBtn, i18n("Play CD")); + ripBtn = new TQToolButton( panel ); + ripBtn->setTextLabel( i18n("Rip CD") ); + ripBtn->setTextPosition( TQToolButton::Under ); + ripBtn->setUsesTextLabel( true ); +- ripBtn->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); ++ ripBtn->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); + TQToolTip::add( ripBtn, i18n("Rip CD")); + + TQHBoxLayout *h1 = new TQHBoxLayout(); +@@ -124,7 +124,7 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine + artistLab = new TQLabel( "", panel ); + artistLab->setLineWidth(1); + artistLab->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); +- artistLab->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); ++ artistLab->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); + h1->addWidget( artistLab ); + vb->addLayout( h1 ); + h1 = new TQHBoxLayout(); +@@ -132,7 +132,7 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine + albumLab = new TQLabel( "", panel ); + albumLab->setLineWidth(1); + albumLab->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); +- albumLab->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); ++ albumLab->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); + h1->addWidget( albumLab ); + vb->addLayout( h1 ); + +@@ -161,7 +161,7 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine + enc->setTextPosition( TQToolButton::Under ); + enc->setUsesTextLabel( true ); + enc->setIconSet( KGlobal::iconLoader()->loadIconSet("kilogram", KIcon::Small) ); +- enc->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); ++ enc->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + connect( enc, TQT_SIGNAL(clicked()), this, TQT_SLOT(encode()) ); + vb->addWidget( encodeWidget ); + encodeWidget->hide(); +diff --git a/kaffeine/src/input/disc/paranoiasettings.ui b/kaffeine/src/input/disc/paranoiasettings.ui +index e20c98f..1d163d3 100644 +--- a/kaffeine/src/input/disc/paranoiasettings.ui ++++ b/kaffeine/src/input/disc/paranoiasettings.ui +@@ -165,7 +165,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>20</width> + <height>60</height> +@@ -190,7 +190,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>152</width> + <height>20</height> +diff --git a/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui b/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui +index 09a2a87..d956e5b 100644 +--- a/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui ++++ b/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui +@@ -108,7 +108,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>20</width> + <height>16</height> +@@ -133,7 +133,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>107</width> + <height>20</height> +diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui b/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui +index b07342a..b243300 100644 +--- a/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui ++++ b/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui +@@ -98,7 +98,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>20</width> + <height>81</height> +@@ -123,7 +123,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>157</width> + <height>20</height> +diff --git a/kaffeine/src/input/dvb/audioeditorui.ui b/kaffeine/src/input/dvb/audioeditorui.ui +index 2324983..1131eec 100644 +--- a/kaffeine/src/input/dvb/audioeditorui.ui ++++ b/kaffeine/src/input/dvb/audioeditorui.ui +@@ -118,7 +118,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>40</width> + <height>20</height> +@@ -137,7 +137,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>20</width> + <height>40</height> +@@ -274,7 +274,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>40</width> + <height>20</height> +diff --git a/kaffeine/src/input/dvb/broadcasteditorui.ui b/kaffeine/src/input/dvb/broadcasteditorui.ui +index 86da4cf..a0939a2 100644 +--- a/kaffeine/src/input/dvb/broadcasteditorui.ui ++++ b/kaffeine/src/input/dvb/broadcasteditorui.ui +@@ -117,7 +117,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>20</width> + <height>20</height> +@@ -150,7 +150,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>20</width> + <height>20</height> +@@ -244,7 +244,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>20</width> + <height>20</height> +diff --git a/kaffeine/src/input/dvb/channeleditorui.ui b/kaffeine/src/input/dvb/channeleditorui.ui +index 24abfbb..ceb3d62 100644 +--- a/kaffeine/src/input/dvb/channeleditorui.ui ++++ b/kaffeine/src/input/dvb/channeleditorui.ui +@@ -72,7 +72,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>40</width> + <height>20</height> +@@ -633,7 +633,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>20</width> + <height>166</height> +@@ -666,7 +666,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>150</width> + <height>20</height> +diff --git a/kaffeine/src/input/dvb/crontimerui.ui b/kaffeine/src/input/dvb/crontimerui.ui +index 5b7a3bd..87baff7 100644 +--- a/kaffeine/src/input/dvb/crontimerui.ui ++++ b/kaffeine/src/input/dvb/crontimerui.ui +@@ -45,7 +45,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>32</width> + <height>20</height> +@@ -138,7 +138,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>20</width> + <height>67</height> +@@ -157,7 +157,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>39</width> + <height>20</height> +@@ -243,7 +243,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>32</width> + <height>20</height> +@@ -262,7 +262,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>20</width> + <height>95</height> +@@ -295,7 +295,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>177</width> + <height>20</height> +diff --git a/kaffeine/src/input/dvb/dvbevents.cpp b/kaffeine/src/input/dvb/dvbevents.cpp +index b842018..a777f79 100644 +--- a/kaffeine/src/input/dvb/dvbevents.cpp ++++ b/kaffeine/src/input/dvb/dvbevents.cpp +@@ -170,7 +170,7 @@ bool DVBevents::tableEIT( unsigned char* buffer ) + TQPtrList<EventDesc> *currentEvents; + bool nodesc, parse; + TQDateTime start, cur, dt; +- unsigned int cdt = TQDateTime::tqcurrentDateTime().toTime_t(); ++ unsigned int cdt = TQDateTime::currentDateTime().toTime_t(); + + tid = getBits(buf,0,8); + length = getBits(buf,12,12); +@@ -298,7 +298,7 @@ ifend: + if ( parse ) + ++(desc->sn); + if ( nodesc ) { +- cur = TQDateTime::tqcurrentDateTime(); ++ cur = TQDateTime::currentDateTime(); + dt = desc->startDateTime; + sec = desc->duration.hour()*3600+desc->duration.minute()*60+desc->duration.second(); + if ( dt.addSecs( sec )<cur || desc->title.length()<3 ) { +diff --git a/kaffeine/src/input/dvb/dvbout.cpp b/kaffeine/src/input/dvb/dvbout.cpp +index bd94126..1f392a8 100644 +--- a/kaffeine/src/input/dvb/dvbout.cpp ++++ b/kaffeine/src/input/dvb/dvbout.cpp +@@ -402,7 +402,7 @@ bool DVBout::goRec( const TQString &name, int maxsize, RecTimer *t ) + + haveRec = true; + if ( recTimer ) { +- TQTime t = recTimer->duration.addSecs( TQDateTime::tqcurrentDateTime().secsTo(recTimer->begin) ); ++ TQTime t = recTimer->duration.addSecs( TQDateTime::currentDateTime().secsTo(recTimer->begin) ); + stopRecTimer.start( TQTime().msecsTo( t ), true ); + } + else +diff --git a/kaffeine/src/input/dvb/dvbpanel.cpp b/kaffeine/src/input/dvb/dvbpanel.cpp +index 3623d7f..1b54229 100644 +--- a/kaffeine/src/input/dvb/dvbpanel.cpp ++++ b/kaffeine/src/input/dvb/dvbpanel.cpp +@@ -114,7 +114,7 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) : + dvb.setAutoDelete( true ); + + mainWidget = new TQVBox( parent ); +- mainWidget->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) ); ++ mainWidget->setSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) ); + split = new TQSplitter( mainWidget ); + split->setOpaqueResize( true ); + pbox = new TQVBox( split ); +@@ -129,7 +129,7 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) : + iconView->setSpacing(0); + iconView->setItemsMovable(false); + iconView->setResizeMode(TQIconView::Adjust); +- iconView->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ) ); ++ iconView->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ) ); + playerBox = new TQVBox( pbox ); + playerBox->setMinimumWidth( 200 ); + panel = new TQFrame( split ); +@@ -192,7 +192,7 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) : + channelsCb->addColumn( i18n("Name") ); + channelsCb->addColumn( i18n("Source") ); + channelsCb->setAllColumnsShowFocus( true ); +- channelsCb->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding) ); ++ channelsCb->setSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding) ); + //channelsCb->setEnabled( false ); + vb->addWidget( channelsCb ); + +@@ -209,14 +209,14 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) : + h1 = new TQHBoxLayout(); + h1->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Minimum ) ); + shiftLed = new KLed( panel ); +- shiftLed->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); ++ shiftLed->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + shiftLed->setDarkFactor( 500 ); + shiftLed->off(); + TQToolTip::add( shiftLed, i18n("Time shifting") ); + h1->addWidget( shiftLed ); + h1->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Minimum ) ); + recordLed = new KLed( panel ); +- recordLed->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); ++ recordLed->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + recordLed->setColor( TQColor( 255,0,0 ) ); + recordLed->setDarkFactor( 500 ); + recordLed->off(); +@@ -224,7 +224,7 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) : + h1->addWidget( recordLed ); + h1->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Minimum ) ); + broadcastLed = new KLed( panel ); +- broadcastLed->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); ++ broadcastLed->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + broadcastLed->setColor( TQColor( 255,128,0 ) ); + broadcastLed->setDarkFactor( 500 ); + broadcastLed->off(); +@@ -272,7 +272,7 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) : + connect( &showOsdTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(dvbOSD()) ); + connect( &tuningTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTuning()) ); + connect( &stopTuningTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTuning()) ); +- connect( &diskTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(disktqStatus()) ); ++ connect( &diskTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(diskStatus()) ); + + setConfig(); + +@@ -295,7 +295,7 @@ void DvbPanel::togglePanel() + + + +-void DvbPanel::disktqStatus() ++void DvbPanel::diskStatus() + { + double freemb; + struct statvfs buf; +@@ -644,7 +644,7 @@ void DvbPanel::dumpEvents() + if ( f.open(IO_WriteOnly|IO_Truncate) ) { + fprintf( stderr, "Creating events file.\n"); + TQTextStream tt( &f ); +- tt << "Saved: "+TQDateTime::tqcurrentDateTime().toString( "dd-MM-yyyy hh:mm:ss" )+"\n"; ++ tt << "Saved: "+TQDateTime::currentDateTime().toString( "dd-MM-yyyy hh:mm:ss" )+"\n"; + k= 0; + for( i=0; i<events.getNSource(); i++ ) { + if ( !(esrc=events.getNEventSource( i )) ) +@@ -956,7 +956,7 @@ void DvbPanel::dvbOSD(ChannelDesc liveChannel, DvbStream *d, int timeShift /* = + s = s+" - "; + s = s+desc->title; + if ( !osdMode && !first && !myshift ) { +- TQDateTime dt = TQDateTime::tqcurrentDateTime(); ++ TQDateTime dt = TQDateTime::currentDateTime(); + int secs = desc->startDateTime.secsTo( dt ); + i = TQTime().secsTo( desc->duration ); + if ( i!=0 ) +@@ -1131,7 +1131,7 @@ void DvbPanel::camClicked( int devNum ) + + + +-TQPtrList<Transponder> DvbPanel::getSourcestqStatus() ++TQPtrList<Transponder> DvbPanel::getSourcesStatus() + { + int i, j; + TQStringList list; +@@ -1163,7 +1163,7 @@ void DvbPanel::fillChannelList( ChannelDesc *ch ) + ChannelDesc *chan; + KListViewItem *it, *visible=0; + bool cont=false; +- TQPtrList<Transponder> trans = getSourcestqStatus(); ++ TQPtrList<Transponder> trans = getSourcesStatus(); + trans.setAutoDelete( true ); + + searchLE->clear(); +@@ -1320,7 +1320,7 @@ void DvbPanel::checkTimers() + bool live=false; + RecTimer *t; + ChannelDesc *chan; +- TQDateTime cur=TQDateTime::tqcurrentDateTime(); ++ TQDateTime cur=TQDateTime::currentDateTime(); + DvbStream *d; + + for ( i=0; i<(int)timers.count(); i++ ) { +@@ -1409,13 +1409,13 @@ void DvbPanel::setRecord() + if ( !dvbConfig->filenameFormat.contains("%chan") ) + s = curchan.name; + if ( !dvbConfig->filenameFormat.contains("%date") ) +- s+="_"+TQDateTime::tqcurrentDateTime().toString( "yyyyMMdd-hhmmss" ); ++ s+="_"+TQDateTime::currentDateTime().toString( "yyyyMMdd-hhmmss" ); + } + + rt = new RecTimer(); + rt->name = s; + rt->channel = curchan.name; +- rt->begin = TQDateTime::tqcurrentDateTime(); ++ rt->begin = TQDateTime::currentDateTime(); + rt->duration = TQTime( 0,0,0).addSecs( dvbConfig->instantDuration*60 ) ; + rt->running = 1; + rt->mode = 0; +@@ -2074,7 +2074,7 @@ void DvbPanel::pauseLiveTV() + if ( !d ) + return; + +- timeShiftFileName = dvbConfig->shiftDir+"DVBLive-"+TQDateTime::tqcurrentDateTime().toString("yyyyMMddThhmmss")+".m2t"; ++ timeShiftFileName = dvbConfig->shiftDir+"DVBLive-"+TQDateTime::currentDateTime().toString("yyyyMMddThhmmss")+".m2t"; + if ( d->doPause( timeShiftFileName ) ) + emit setTimeShiftFilename( timeShiftFileName ); + } +diff --git a/kaffeine/src/input/dvb/dvbpanel.h b/kaffeine/src/input/dvb/dvbpanel.h +index d126bb6..4dbf554 100644 +--- a/kaffeine/src/input/dvb/dvbpanel.h ++++ b/kaffeine/src/input/dvb/dvbpanel.h +@@ -154,7 +154,7 @@ public slots: + + void dvbNewTimer( TQString name, TQString channel, TQString datetime, TQString duration ); + int getSNR( int device ); +- void disktqStatus(); ++ void diskStatus(); + void camClicked( int devNum ); + + private: +@@ -163,7 +163,7 @@ private: + bool getTimerList(); + bool saveTimerList(); + void fillChannelList( ChannelDesc *ch=0 ); +- TQPtrList<Transponder> getSourcestqStatus(); ++ TQPtrList<Transponder> getSourcesStatus(); + void updateModeTimer( RecTimer *t ); + DvbStream* getWorkingDvb( int mode, ChannelDesc *chan ); + +diff --git a/kaffeine/src/input/dvb/dvbstream.cpp b/kaffeine/src/input/dvb/dvbstream.cpp +index b3ca31d..4ef290b 100644 +--- a/kaffeine/src/input/dvb/dvbstream.cpp ++++ b/kaffeine/src/input/dvb/dvbstream.cpp +@@ -84,7 +84,7 @@ DvbStream::DvbStream( Device *d, const TQString &charset, EventTable *et ) + cam = NULL; + plug = NULL; + +- connect( &statusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(checktqStatus()) ); ++ connect( &statusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(checkStatus()) ); + } + + +@@ -221,7 +221,7 @@ bool DvbStream::closeFe() + + + +-void DvbStream::connecttqStatus( bool con ) ++void DvbStream::connectStatus( bool con ) + { + if ( con ) + statusTimer.start( 1000 ); +@@ -879,7 +879,7 @@ void DvbStream::removeOut( DVBout *o ) + + + +-bool DvbStream::checktqStatus() ++bool DvbStream::checkStatus() + { + int32_t strength; + fe_status_t festatus; +@@ -887,19 +887,19 @@ bool DvbStream::checktqStatus() + + strength=0; + ioctl(fdFrontend,FE_READ_SIGNAL_STRENGTH,&strength); +- emit signaltqStatus(strength*100/65535); ++ emit signalStatus(strength*100/65535); + + strength=0; + ioctl(fdFrontend,FE_READ_SNR,&strength); +- emit snrtqStatus(strength*100/65535); ++ emit snrStatus(strength*100/65535); + + memset( &festatus, 0, sizeof(festatus) ); + ioctl(fdFrontend,FE_READ_STATUS,&festatus); + + if (festatus & FE_HAS_LOCK) +- emit locktqStatus( true ); ++ emit lockStatus( true ); + else { +- emit locktqStatus( false ); ++ emit lockStatus( false ); + ret = false; + } + +@@ -1481,7 +1481,7 @@ void DvbStream::stopFrontend() + + void DvbStream::setScanning( bool b ) + { +- connecttqStatus( b ); ++ connectStatus( b ); + } + + +diff --git a/kaffeine/src/input/dvb/dvbstream.h b/kaffeine/src/input/dvb/dvbstream.h +index f793aa0..1d2d780 100644 +--- a/kaffeine/src/input/dvb/dvbstream.h ++++ b/kaffeine/src/input/dvb/dvbstream.h +@@ -99,7 +99,7 @@ public : + + public slots: + +- bool checktqStatus(); ++ bool checkStatus(); + void receivePlayDvb(); + void recordEnded( DVBout *o, RecTimer *t, bool kill ); + void receiveShifting( bool b ); +@@ -125,7 +125,7 @@ private : + void startReading(); + bool openFe(); + bool closeFe(); +- void connecttqStatus( bool con ); ++ void connectStatus( bool con ); + + TQFile liveFile; + bool timeShifting; +@@ -157,9 +157,9 @@ signals: + void timerEnded(RecTimer*); + + void errorMsg( TQString ); +- void snrtqStatus( int ); +- void signaltqStatus( int ); +- void locktqStatus( bool ); ++ void snrStatus( int ); ++ void signalStatus( int ); ++ void lockStatus( bool ); + void shifting( bool ); + + }; +diff --git a/kaffeine/src/input/dvb/kgradprogress.cpp b/kaffeine/src/input/dvb/kgradprogress.cpp +index d81f671..7898f84 100644 +--- a/kaffeine/src/input/dvb/kgradprogress.cpp ++++ b/kaffeine/src/input/dvb/kgradprogress.cpp +@@ -34,7 +34,7 @@ KGradProgress::KGradProgress( TQWidget *parent ) : TQLabel( parent ) + setFrameStyle( TQFrame::Box | TQFrame::Plain ); + setLineWidth(1); + setMidLineWidth(0); +- tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ); ++ setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ); + } + + +@@ -113,7 +113,7 @@ void KGradProgress::paintEvent(TQPaintEvent *event) + + + +-TQSize KGradProgress::tqsizeHint() ++TQSize KGradProgress::sizeHint() + { + TQLabel lab( "This is a progress bar.", 0 ); + return TQSize( lab.width(), int(font().pointSize()*1.2) ); +diff --git a/kaffeine/src/input/dvb/kgradprogress.h b/kaffeine/src/input/dvb/kgradprogress.h +index 887019d..84aeee0 100644 +--- a/kaffeine/src/input/dvb/kgradprogress.h ++++ b/kaffeine/src/input/dvb/kgradprogress.h +@@ -37,7 +37,7 @@ public: + KGradProgress( TQWidget *parent ); + ~KGradProgress(); + virtual void paintEvent(TQPaintEvent *event); +- virtual TQSize tqsizeHint(); ++ virtual TQSize sizeHint(); + virtual TQSizePolicy sizePolicy(); + + public slots: +diff --git a/kaffeine/src/input/dvb/ktimereditor.cpp b/kaffeine/src/input/dvb/ktimereditor.cpp +index c66c5d1..be5c5af 100644 +--- a/kaffeine/src/input/dvb/ktimereditor.cpp ++++ b/kaffeine/src/input/dvb/ktimereditor.cpp +@@ -85,7 +85,7 @@ KTimerEditor::KTimerEditor( bool newone, TQStringList &chanList, RecTimer t, TQW + channelComb->insertStringList( chanList ); + + if ( newone ) { +- begin->setDateTime( TQDateTime::tqcurrentDateTime() ); ++ begin->setDateTime( TQDateTime::currentDateTime() ); + duration->setTime( TQTime(2,0,0) ); + } + else { +diff --git a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp +index f05ff3a..ea00f76 100644 +--- a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp ++++ b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp +@@ -297,7 +297,7 @@ void EventTable::loadEpg() + char buf[EPGBUFSIZE]; + int num=0; + unsigned char sync; +- TQDateTime cur=TQDateTime::tqcurrentDateTime(); ++ TQDateTime cur=TQDateTime::currentDateTime(); + TQTime t1=TQTime::currentTime(); + + if ( epgLoaded ) +@@ -416,7 +416,7 @@ void EventTable::run() + + setpriority(PRIO_PROCESS, 0, 19); + +- cur = TQDateTime::tqcurrentDateTime(); ++ cur = TQDateTime::currentDateTime(); + for( k=0; k<getNSource(); k++ ) { + if ( !(esrc=getNEventSource( k )) ) + continue; +diff --git a/kaffeine/src/input/dvb/scandialog.cpp b/kaffeine/src/input/dvb/scandialog.cpp +index f433054..7f760e6 100644 +--- a/kaffeine/src/input/dvb/scandialog.cpp ++++ b/kaffeine/src/input/dvb/scandialog.cpp +@@ -148,9 +148,9 @@ ScanDialog::ScanDialog( TQPtrList<DvbStream> *d, TQPtrList<ChannelDesc> *ch, TQS + offsetGroup->hide(); + bool ok=false; + dvbsi = new DVBsi( &ok, ds->getAdapter(), ds->getTuner(), ds, defaultCharset ); +- connect( ds, TQT_SIGNAL(snrtqStatus(int)), snr, TQT_SLOT(setProgress(int)) ); +- connect( ds, TQT_SIGNAL(signaltqStatus(int)), signal, TQT_SLOT(setProgress(int)) ); +- connect( ds, TQT_SIGNAL(locktqStatus(bool)), this, TQT_SLOT(setLock(bool)) ); ++ connect( ds, TQT_SIGNAL(snrStatus(int)), snr, TQT_SLOT(setProgress(int)) ); ++ connect( ds, TQT_SIGNAL(signalStatus(int)), signal, TQT_SLOT(setProgress(int)) ); ++ connect( ds, TQT_SIGNAL(lockStatus(bool)), this, TQT_SLOT(setLock(bool)) ); + connect( dvbsi, TQT_SIGNAL(end(bool)), this, TQT_SLOT(siEnded(bool)) ); + + connect( &checkTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( checkNewChannel() ) ); +@@ -209,9 +209,9 @@ void ScanDialog::setDvb( int index ) + checkTimer.stop(); + if ( progressTimer.isActive() ) + progressTimer.stop(); +- disconnect( ds, TQT_SIGNAL(snrtqStatus(int)), snr, TQT_SLOT(setProgress(int)) ); +- disconnect( ds, TQT_SIGNAL(signaltqStatus(int)), signal, TQT_SLOT(setProgress(int)) ); +- disconnect( ds, TQT_SIGNAL(locktqStatus(bool)), this, TQT_SLOT(setLock(bool)) ); ++ disconnect( ds, TQT_SIGNAL(snrStatus(int)), snr, TQT_SLOT(setProgress(int)) ); ++ disconnect( ds, TQT_SIGNAL(signalStatus(int)), signal, TQT_SLOT(setProgress(int)) ); ++ disconnect( ds, TQT_SIGNAL(lockStatus(bool)), this, TQT_SLOT(setLock(bool)) ); + disconnect( dvbsi, TQT_SIGNAL(end(bool)), this, TQT_SLOT(siEnded(bool)) ); + ds->setScanning( false ); + dvbsi->stop(); +@@ -219,9 +219,9 @@ void ScanDialog::setDvb( int index ) + ds = dvb->at(i); + ds->setScanning( true ); + dvbsi = new DVBsi( &ok, ds->getAdapter(), ds->getTuner(), ds, defaultCharset ); +- connect( ds, TQT_SIGNAL(snrtqStatus(int)), snr, TQT_SLOT(setProgress(int)) ); +- connect( ds, TQT_SIGNAL(signaltqStatus(int)), signal, TQT_SLOT(setProgress(int)) ); +- connect( ds, TQT_SIGNAL(locktqStatus(bool)), this, TQT_SLOT(setLock(bool)) ); ++ connect( ds, TQT_SIGNAL(snrStatus(int)), snr, TQT_SLOT(setProgress(int)) ); ++ connect( ds, TQT_SIGNAL(signalStatus(int)), signal, TQT_SLOT(setProgress(int)) ); ++ connect( ds, TQT_SIGNAL(lockStatus(bool)), this, TQT_SLOT(setLock(bool)) ); + connect( dvbsi, TQT_SIGNAL(end(bool)), this, TQT_SLOT(siEnded(bool)) ); + break; + } +diff --git a/kaffeine/src/input/dvb/scandialogui.ui b/kaffeine/src/input/dvb/scandialogui.ui +index d85d58f..dbcff8b 100644 +--- a/kaffeine/src/input/dvb/scandialogui.ui ++++ b/kaffeine/src/input/dvb/scandialogui.ui +@@ -118,7 +118,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>40</width> + <height>20</height> +@@ -257,7 +257,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>20</width> + <height>18</height> +@@ -282,7 +282,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>21</width> + <height>19</height> +@@ -503,7 +503,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>40</width> + <height>20</height> +diff --git a/kaffeine/src/input/dvb/subeditorui.ui b/kaffeine/src/input/dvb/subeditorui.ui +index 3935e78..fb8d391 100644 +--- a/kaffeine/src/input/dvb/subeditorui.ui ++++ b/kaffeine/src/input/dvb/subeditorui.ui +@@ -51,7 +51,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>40</width> + <height>20</height> +@@ -159,7 +159,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>40</width> + <height>20</height> +@@ -178,7 +178,7 @@ + <property name="sizeType"> + <enum>Expanding</enum> + </property> +- <property name="tqsizeHint"> ++ <property name="sizeHint"> + <size> + <width>20</width> + <height>180</height> +diff --git a/kaffeine/src/input/dvbclient/cdwidget.cpp b/kaffeine/src/input/dvbclient/cdwidget.cpp +index 19e82ed..ede428f 100644 +--- a/kaffeine/src/input/dvbclient/cdwidget.cpp ++++ b/kaffeine/src/input/dvbclient/cdwidget.cpp +@@ -33,14 +33,14 @@ CdWidget::CdWidget( const TQString &ad, int port, int info, const TQString &tspa + : KaffeineInput( objParent, name ) + { + mainWidget = new TQVBox( parent ); +- mainWidget->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) ); ++ mainWidget->setSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) ); + split = new TQSplitter( mainWidget ); + split->setOpaqueResize( true ); + playerBox = new TQVBox( split ); + playerBox->setMinimumWidth( 200 ); + channelsLb = new TQListBox( split ); + split->moveToFirst( channelsLb ); +- channelsLb->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding) ); ++ channelsLb->setSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding) ); + split->setResizeMode( channelsLb, TQSplitter::KeepSize ); + + cdAddress = ad; +@@ -324,7 +324,7 @@ void CdWidget::pauseLiveTV() + if ( !dump ) + return; + if ( dump->running() ) { +- timeShiftFileName = cdShiftDir+"DVBClient-"+TQDateTime::tqcurrentDateTime().toString( Qt::ISODate )+".ts"; ++ timeShiftFileName = cdShiftDir+"DVBClient-"+TQDateTime::currentDateTime().toString( Qt::ISODate )+".ts"; + if ( dump->doPause( timeShiftFileName ) ) emit setTimeShiftFilename( timeShiftFileName ); + } + } +diff --git a/kaffeine/src/inputmanager.cpp b/kaffeine/src/inputmanager.cpp +index 0e9dcdf..a110a0a 100644 +--- a/kaffeine/src/inputmanager.cpp ++++ b/kaffeine/src/inputmanager.cpp +@@ -323,7 +323,7 @@ bool InputManager::playbackFinished( MRL &mrl ) + + void InputManager::statusBarMessage( const TQString &msg ) + { +- kaffeine->slotChangePlaylisttqStatus( msg ); ++ kaffeine->slotChangePlaylistStatus( msg ); + } + + +@@ -530,13 +530,13 @@ void InputManager::fullscreen( bool b ) + int id=0; + + if ( b ) { +- stack->tqsetSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored); ++ stack->setSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored); + oldMainWidget = currentMainWidget; + show( 2 ); + mtBar->hide(); + } + else { +- stack->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); ++ stack->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + mtBar->show(); + if ( oldMainWidget==startWindow ) + id = 1; +@@ -578,7 +578,7 @@ void PlayerContainer::dropEvent(TQDropEvent* dev) + { + for (uint i=0; i < urls.count() ;i++) + { +- //KURL url(TQUriDrag::tqunicodeUriToUri(urls[i])); ++ //KURL url(TQUriDrag::unicodeUriToUri(urls[i])); + //newurls << url.path(-1); + //kdDebug() << "Kaffeine: Dropped " << url.path() << endl; + newurls << urls[i]; +@@ -596,7 +596,7 @@ void PlayerContainer::dropEvent(TQDropEvent* dev) + else + if (strcmp(dev->format(), "text/x-moz-url") == 0) // for mozilla drops + { +- TQByteArray data = dev->tqencodedData("text/plain"); ++ TQByteArray data = dev->encodedData("text/plain"); + TQString md(data); + emit signalURLDropEvent(md); + } +diff --git a/kaffeine/src/instwizard.cpp b/kaffeine/src/instwizard.cpp +index c8cca22..8e2f412 100644 +--- a/kaffeine/src/instwizard.cpp ++++ b/kaffeine/src/instwizard.cpp +@@ -272,7 +272,7 @@ void InstWizard::internalWizard() + + void InstWizard::slotStdout(KProcess *, char *buffer, int buflen) + { +- TQString output = TQString::tqfromLatin1(buffer, buflen); ++ TQString output = TQString::fromLatin1(buffer, buflen); + kdDebug() << "WizardDialog: got from hdparm: " << output << "\n"; + stdout.append(output); + } +diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp +index 9a83567..5b188da 100644 +--- a/kaffeine/src/kaffeine.cpp ++++ b/kaffeine/src/kaffeine.cpp +@@ -653,7 +653,7 @@ void Kaffeine::dropEvent(TQDropEvent* dev) + else + if (strcmp(dev->format(), "text/x-moz-url") == 0) // for mozilla drops + { +- TQByteArray data = dev->tqencodedData("text/plain"); ++ TQByteArray data = dev->encodedData("text/plain"); + TQString md(data); + load(md); + } +@@ -1087,7 +1087,7 @@ void Kaffeine::slotOpenFile() + KURL::List kurlList = KFileDialog::getOpenURLs(":kaffeine_openFile", fileFilter, 0, i18n("Open File(s)")); + + for (KURL::List::Iterator it = kurlList.begin(); it != kurlList.end(); ++it) +- if ((*it).isLocalFile() && (*it).path().tqendsWith(".iso", false)) ++ if ((*it).isLocalFile() && (*it).path().endsWith(".iso", false)) + (*it).setProtocol("dvd"); + + TQStringList urlList = kurlList.toStringList(); +@@ -1557,7 +1557,7 @@ void Kaffeine::slotChangeStatusbar(const TQString& ) + } + + +-void Kaffeine::slotChangePlaylisttqStatus(const TQString& ) ++void Kaffeine::slotChangePlaylistStatus(const TQString& ) + { + //statusBar()->changeItem(text, 9); + } +diff --git a/kaffeine/src/kaffeine.h b/kaffeine/src/kaffeine.h +index 79ad0cc..4496d93 100644 +--- a/kaffeine/src/kaffeine.h ++++ b/kaffeine/src/kaffeine.h +@@ -128,7 +128,7 @@ public slots: + void slotLoadURLS(const TQStringList&); + void slotSwitchToPlayerWindow(); + void slotChangeStatusbar(const TQString&); +- void slotChangePlaylisttqStatus(const TQString&); ++ void slotChangePlaylistStatus(const TQString&); + void slotStop(); + void slotPlayUnPause(); + +diff --git a/kaffeine/src/kmultitabbar.cpp b/kaffeine/src/kmultitabbar.cpp +index 1c32cae..308bfa5 100644 +--- a/kaffeine/src/kmultitabbar.cpp ++++ b/kaffeine/src/kmultitabbar.cpp +@@ -121,9 +121,9 @@ void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clip + if (m_position==KMultiTabBar::Right) + { + +- paint->setPen(tqcolorGroup().shadow()); ++ paint->setPen(colorGroup().shadow()); + paint->drawLine(0,0,0,viewport()->height()); +- paint->setPen(tqcolorGroup().background().dark(120)); ++ paint->setPen(colorGroup().background().dark(120)); + paint->drawLine(1,0,1,viewport()->height()); + + +@@ -131,28 +131,28 @@ void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clip + else + if (m_position==KMultiTabBar::Left) + { +- paint->setPen(tqcolorGroup().light()); ++ paint->setPen(colorGroup().light()); + paint->drawLine(23,0,23,viewport()->height()); + paint->drawLine(22,0,22,viewport()->height()); + +- paint->setPen(tqcolorGroup().shadow()); ++ paint->setPen(colorGroup().shadow()); + paint->drawLine(0,0,0,viewport()->height()); + } + else + if (m_position==KMultiTabBar::Bottom) + { +- paint->setPen(tqcolorGroup().shadow()); ++ paint->setPen(colorGroup().shadow()); + paint->drawLine(0,0,viewport()->width(),0); +- paint->setPen(tqcolorGroup().background().dark(120)); ++ paint->setPen(colorGroup().background().dark(120)); + paint->drawLine(0,1,viewport()->width(),1); + } + else + { +- paint->setPen(tqcolorGroup().light()); ++ paint->setPen(colorGroup().light()); + paint->drawLine(0,23,viewport()->width(),23); + paint->drawLine(0,22,viewport()->width(),22); + +-/* paint->setPen(tqcolorGroup().shadow()); ++/* paint->setPen(colorGroup().shadow()); + paint->drawLine(0,0,0,viewport()->height());*/ + + } +@@ -458,7 +458,7 @@ void KMultiTabBarButton::showEvent( TQShowEvent* he) { + } + + +-TQSize KMultiTabBarButton::tqsizeHint() const ++TQSize KMultiTabBarButton::sizeHint() const + { + constPolish(); + +@@ -474,7 +474,7 @@ TQSize KMultiTabBarButton::tqsizeHint() const + } + #endif + if ( isMenuButton() ) +- w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this); ++ w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this); + + if ( pixmap() ) { + TQPixmap *pm = (TQPixmap *)pixmap(); +@@ -484,7 +484,7 @@ TQSize KMultiTabBarButton::tqsizeHint() const + TQString s( text() ); + bool empty = s.isEmpty(); + if ( empty ) +- s = TQString::tqfromLatin1("XXXX"); ++ s = TQString::fromLatin1("XXXX"); + TQFontMetrics fm = fontMetrics(); + TQSize sz = fm.size( ShowPrefix, s ); + if(!empty || !w) +@@ -581,12 +581,12 @@ void KMultiTabBarTab::updateState() + if ((m_position==KMultiTabBar::Right || m_position==KMultiTabBar::Left)) { + setFixedWidth(24); + if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (down)) { +- setFixedHeight(KMultiTabBarButton::tqsizeHint().width()); ++ setFixedHeight(KMultiTabBarButton::sizeHint().width()); + } else setFixedHeight(36); + } else { + setFixedHeight(24); + if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (down)) { +- setFixedWidth(KMultiTabBarButton::tqsizeHint().width()); ++ setFixedWidth(KMultiTabBarButton::sizeHint().width()); + } else setFixedWidth(36); + } + } else { +@@ -637,7 +637,7 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) { + const int height = 24; + if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (down)) { + if ((m_position==KMultiTabBar::Left) || (m_position==KMultiTabBar::Right)) +- sh=TQSize(this->height(),this->width());//KMultiTabBarButton::tqsizeHint(); ++ sh=TQSize(this->height(),this->width());//KMultiTabBarButton::sizeHint(); + else sh=TQSize(this->width(),this->height()); + } + else +@@ -654,8 +654,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) { + + if (down) st|=TQStyle::Style_On; + +- tqstyle().tqdrawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), tqcolorGroup(),st); +- tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), tqcolorGroup(),st); ++ tqstyle().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st); ++ tqstyle().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st); + + switch (m_position) { + case KMultiTabBar::Left: +@@ -671,8 +671,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) { + paint->drawPixmap(0,0,pixmap); + break; + } +-// tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), +-// tqcolorGroup(),TQStyle::Style_Enabled); ++// tqstyle().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), ++// colorGroup(),TQStyle::Style_Enabled); + + + } +@@ -682,58 +682,58 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint) + TQPixmap pixmap; + if ( iconSet()) + pixmap = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ); +- paint->fillRect(0, 0, 24, 24, tqcolorGroup().background()); ++ paint->fillRect(0, 0, 24, 24, colorGroup().background()); + + if (!down) + { + + if (m_position==KMultiTabBar::Right) + { +- paint->fillRect(0,0,21,21,TQBrush(tqcolorGroup().background())); ++ paint->fillRect(0,0,21,21,TQBrush(colorGroup().background())); + +- paint->setPen(tqcolorGroup().background().dark(150)); ++ paint->setPen(colorGroup().background().dark(150)); + paint->drawLine(0,22,23,22); + + paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap); + +- paint->setPen(tqcolorGroup().shadow()); ++ paint->setPen(colorGroup().shadow()); + paint->drawLine(0,0,0,23); +- paint->setPen(tqcolorGroup().background().dark(120)); ++ paint->setPen(colorGroup().background().dark(120)); + paint->drawLine(1,0,1,23); + + } + else + if ((m_position==KMultiTabBar::Bottom) || (m_position==KMultiTabBar::Top)) + { +- paint->fillRect(0,1,23,22,TQBrush(tqcolorGroup().background())); ++ paint->fillRect(0,1,23,22,TQBrush(colorGroup().background())); + + paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap); + +- paint->setPen(tqcolorGroup().background().dark(120)); ++ paint->setPen(colorGroup().background().dark(120)); + paint->drawLine(23,0,23,23); + + +- paint->setPen(tqcolorGroup().light()); ++ paint->setPen(colorGroup().light()); + paint->drawLine(0,22,23,22); + paint->drawLine(0,23,23,23); +- paint->setPen(tqcolorGroup().shadow()); ++ paint->setPen(colorGroup().shadow()); + paint->drawLine(0,0,23,0); +- paint->setPen(tqcolorGroup().background().dark(120)); ++ paint->setPen(colorGroup().background().dark(120)); + paint->drawLine(0,1,23,1); + + } + else + { +- paint->setPen(tqcolorGroup().background().dark(120)); ++ paint->setPen(colorGroup().background().dark(120)); + paint->drawLine(0,23,23,23); +- paint->fillRect(0,0,23,21,TQBrush(tqcolorGroup().background())); ++ paint->fillRect(0,0,23,21,TQBrush(colorGroup().background())); + paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap); + +- paint->setPen(tqcolorGroup().light()); ++ paint->setPen(colorGroup().light()); + paint->drawLine(23,0,23,23); + paint->drawLine(22,0,22,23); + +- paint->setPen(tqcolorGroup().shadow()); ++ paint->setPen(colorGroup().shadow()); + paint->drawLine(0,0,0,23); + + } +@@ -744,12 +744,12 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint) + { + if (m_position==KMultiTabBar::Right) + { +- paint->setPen(tqcolorGroup().shadow()); ++ paint->setPen(colorGroup().shadow()); + paint->drawLine(0,height()-1,23,height()-1); + paint->drawLine(0,height()-2,23,height()-2); + paint->drawLine(23,0,23,height()-1); + paint->drawLine(22,0,22,height()-1); +- paint->fillRect(0,0,21,height()-3,TQBrush(tqcolorGroup().light())); ++ paint->fillRect(0,0,21,height()-3,TQBrush(colorGroup().light())); + paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap); + + if (m_showActiveTabText) +@@ -759,9 +759,9 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint) + TQPixmap tpixmap(height()-25-3, width()-2); + TQPainter painter(&tpixmap); + +- painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light())); ++ painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light())); + +- painter.setPen(tqcolorGroup().text()); ++ painter.setPen(colorGroup().text()); + painter.drawText(0,+width()/2+TQFontMetrics(TQFont()).height()/2,m_text); + + paint->rotate(90); +@@ -773,25 +773,25 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint) + else + if (m_position==KMultiTabBar::Top) + { +- paint->fillRect(0,0,width()-1,23,TQBrush(tqcolorGroup().light())); ++ paint->fillRect(0,0,width()-1,23,TQBrush(colorGroup().light())); + paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap); + if (m_showActiveTabText) + { +- paint->setPen(tqcolorGroup().text()); ++ paint->setPen(colorGroup().text()); + paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text); + } + } + else + if (m_position==KMultiTabBar::Bottom) + { +- paint->setPen(tqcolorGroup().shadow()); ++ paint->setPen(colorGroup().shadow()); + paint->drawLine(0,23,width()-1,23); + paint->drawLine(0,22,width()-1,22); +- paint->fillRect(0,0,width()-1,21,TQBrush(tqcolorGroup().light())); ++ paint->fillRect(0,0,width()-1,21,TQBrush(colorGroup().light())); + paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap); + if (m_showActiveTabText) + { +- paint->setPen(tqcolorGroup().text()); ++ paint->setPen(colorGroup().text()); + paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text); + } + +@@ -800,10 +800,10 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint) + { + + +- paint->setPen(tqcolorGroup().shadow()); ++ paint->setPen(colorGroup().shadow()); + paint->drawLine(0,height()-1,23,height()-1); + paint->drawLine(0,height()-2,23,height()-2); +- paint->fillRect(0,0,23,height()-3,TQBrush(tqcolorGroup().light())); ++ paint->fillRect(0,0,23,height()-3,TQBrush(colorGroup().light())); + paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap); + if (m_showActiveTabText) + { +@@ -813,9 +813,9 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint) + TQPixmap tpixmap(height()-25-3, width()-2); + TQPainter painter(&tpixmap); + +- painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light())); ++ painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light())); + +- painter.setPen(tqcolorGroup().text()); ++ painter.setPen(colorGroup().text()); + painter.drawText(tpixmap.width()-TQFontMetrics(TQFont()).width(m_text),+width()/2+TQFontMetrics(TQFont()).height()/2,m_text); + + paint->rotate(-90); +@@ -842,13 +842,13 @@ KMultiTabBar::KMultiTabBar(KMultiTabBarMode bm, TQWidget *parent,const char *nam + if (bm==Vertical) + { + m_l=new TQVBoxLayout(this); +- tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding, true); ++ setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding, true); + // setFixedWidth(24); + } + else + { + m_l=new TQHBoxLayout(this); +- tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, true); ++ setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, true); + // setFixedHeight(24); + } + m_l->setMargin(0); +diff --git a/kaffeine/src/kmultitabbar.h b/kaffeine/src/kmultitabbar.h +index 25aa255..bc9a615 100644 +--- a/kaffeine/src/kmultitabbar.h ++++ b/kaffeine/src/kmultitabbar.h +@@ -182,7 +182,7 @@ public slots: + */ + void setText(const TQString &); + +- TQSize tqsizeHint() const; ++ TQSize sizeHint() const; + + protected: + KMultiTabBar::KMultiTabBarPosition m_position; +diff --git a/kaffeine/src/player-parts/gstreamer-part/videosettings.cpp b/kaffeine/src/player-parts/gstreamer-part/videosettings.cpp +index 29d8587..2d0244a 100644 +--- a/kaffeine/src/player-parts/gstreamer-part/videosettings.cpp ++++ b/kaffeine/src/player-parts/gstreamer-part/videosettings.cpp +@@ -39,7 +39,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contr, int bright, TQWidget * + grid->setSpacing(5); + + TQLabel* hueText = new TQLabel(i18n("Hue"), page); +- hueText->tqsetAlignment(AlignRight); ++ hueText->setAlignment(AlignRight); + m_hueSlider = new TQSlider(Qt::Horizontal, page); + m_hueSlider->setRange(-1000, 1000); + m_hueSlider->setSteps(10, 100); +@@ -49,7 +49,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contr, int bright, TQWidget * + grid->addWidget(m_hueSlider, 0, 1); + + TQLabel* satText = new TQLabel(i18n("Saturation"), page); +- satText->tqsetAlignment(AlignRight); ++ satText->setAlignment(AlignRight); + m_satSlider = new TQSlider(Qt::Horizontal, page); + m_satSlider->setRange(-1000, 1000); + m_satSlider->setSteps(10, 100); +@@ -59,7 +59,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contr, int bright, TQWidget * + grid->addWidget(m_satSlider, 1, 1); + + TQLabel* contrastText = new TQLabel(i18n("Contrast"), page); +- contrastText->tqsetAlignment(AlignRight); ++ contrastText->setAlignment(AlignRight); + m_contrastSlider = new TQSlider(Qt::Horizontal, page); + m_contrastSlider->setRange(-1000, 1000); + m_contrastSlider->setSteps(10, 100); +@@ -69,7 +69,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contr, int bright, TQWidget * + grid->addWidget(m_contrastSlider, 2, 1); + + TQLabel* brightText = new TQLabel(i18n("Brightness"), page); +- brightText->tqsetAlignment(AlignRight); ++ brightText->setAlignment(AlignRight); + m_brightSlider = new TQSlider(Qt::Horizontal, page); + m_brightSlider->setRange(-1000, 1000); + m_brightSlider->setSteps(10, 100); +diff --git a/kaffeine/src/player-parts/xine-part/deinterlacequality.cpp b/kaffeine/src/player-parts/xine-part/deinterlacequality.cpp +index 9abb266..c8d253c 100644 +--- a/kaffeine/src/player-parts/xine-part/deinterlacequality.cpp ++++ b/kaffeine/src/player-parts/xine-part/deinterlacequality.cpp +@@ -78,12 +78,12 @@ DeinterlaceQuality::DeinterlaceQuality(TQWidget* filterDialog, TQWidget *parent, + connect(m_customBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotCustomBoxToggled(bool))); + + m_customConfigButton = new KPushButton(i18n("Configure tvtime Deinterlace Plugin..."), mainWidget); +- m_customConfigButton->tqsetSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed)); ++ m_customConfigButton->setSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed)); + grid->addWidget(m_customConfigButton, 7, 1); + connect(m_customConfigButton, TQT_SIGNAL(clicked()), filterDialog, TQT_SLOT(show())); + + TQLabel* note = new TQLabel(i18n("* <i>May require a patched 2.4 kernel (like RedHat one) or 2.6 kernel.</i>"), mainWidget); +- note->tqsetAlignment(TQLabel::WordBreak | TQLabel::AlignVCenter); ++ note->setAlignment(TQLabel::WordBreak | TQLabel::AlignVCenter); + grid->addMultiCellWidget(note, 9, 9, 0, 1); + } + +diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp +index 9385759..58a9818 100644 +--- a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp ++++ b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp +@@ -721,7 +721,7 @@ void KXineWidget::timerEvent( TQTimerEvent* tevent ) + } + case TIMER_EVENT_NEW_STATUS: + { +- emit signalXinetqStatus(m_statusString); ++ emit signalXineStatus(m_statusString); + break; + } + case TIMER_EVENT_CHANGE_CURSOR: +@@ -1109,7 +1109,7 @@ bool KXineWidget::initXine() + if (isXineReady()) + return true; + +- emit signalXinetqStatus(i18n("Init xine...")); ++ emit signalXineStatus(i18n("Init xine...")); + globalPosChanged(); /* get global pos of the window */ + + /**** INIT XINE DISPLAY ****/ +@@ -1377,7 +1377,7 @@ bool KXineWidget::initXine() + + debugOut("xine init successful"); + +- emit signalXinetqStatus(i18n("Ready")); ++ emit signalXineStatus(i18n("Ready")); + emit signalXineReady(); + + /** something to play? **/ +@@ -1508,7 +1508,7 @@ bool KXineWidget::playDvb() + m_posTimer.start(1000); + + emit signalXinePlaying(); +- emit signalXinetqStatus(i18n("Playing")); ++ emit signalXineStatus(i18n("Playing")); + + return true; + } +@@ -1882,7 +1882,7 @@ bool KXineWidget::openDvb() + } + else fprintf(stderr,"xine pipe opened %s\n", m_trackURL.ascii()); + m_trackURL = "DVB"; +- emit signalXinetqStatus(i18n("DVB: opening...")); ++ emit signalXineStatus(i18n("DVB: opening...")); + TQTimer::singleShot( 0, this, TQT_SLOT(playDvb()) ); + + return true; +@@ -1936,7 +1936,7 @@ void KXineWidget::slotPlay() + m_queue.remove(m_queue.find(m_trackURL)); + + if (m_trackURL != m_logoFile) +- emit signalXinetqStatus(i18n("Opening...")); ++ emit signalXineStatus(i18n("Opening...")); + + /* check for external subtitle file or save url */ + m_trackSubtitleURL = TQString(); +@@ -2053,7 +2053,7 @@ void KXineWidget::slotPlay() + CodecUtf8 = TQTextCodec::codecForName("UTF-8"); + + TQString infotag; +- infotag = TQString::tqfromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_TITLE)); ++ infotag = TQString::fromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_TITLE)); + + if (currentUtf8Locale) + m_trackTitle = infotag; +@@ -2068,9 +2068,9 @@ void KXineWidget::slotPlay() + TQString trackArtist=NULL; + TQString trackAlbum=NULL; + TQString trackComment=NULL; +- trackArtist = TQString::tqfromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_ARTIST)); +- trackAlbum = TQString::tqfromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_ALBUM)); +- trackComment = TQString::tqfromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_COMMENT)); ++ trackArtist = TQString::fromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_ARTIST)); ++ trackAlbum = TQString::fromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_ALBUM)); ++ trackComment = TQString::fromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_COMMENT)); + if (currentUtf8Locale) + { + m_trackArtist = trackArtist; +@@ -2157,9 +2157,9 @@ void KXineWidget::slotPlay() + { + emit signalXinePlaying(); + if (hasSaveURL()) +- emit signalXinetqStatus(i18n("Recording")); ++ emit signalXineStatus(i18n("Recording")); + else +- emit signalXinetqStatus(i18n("Playing")); ++ emit signalXineStatus(i18n("Playing")); + } + } + +@@ -2239,7 +2239,7 @@ void KXineWidget::sendXineError() + { + if (m_trackURL != m_logoFile) + { +- emit signalXinetqStatus(i18n("Error")); ++ emit signalXineStatus(i18n("Error")); + emit signalXineError(error); + } + else +@@ -2671,7 +2671,7 @@ void KXineWidget::slotSetVolume(int vol) + //debugOut(TQString("Set audio mixer volume: %1").tqarg(vol)); + xine_set_param(m_xineStream, XINE_PARAM_AUDIO_VOLUME, vol); + } +- emit signalXinetqStatus(i18n("Volume") + ": " + TQString::number(vol) +"%"); ++ emit signalXineStatus(i18n("Volume") + ": " + TQString::number(vol) +"%"); + } + + uint KXineWidget::getVolume() const +@@ -2707,12 +2707,12 @@ void KXineWidget::slotToggleMute() + if (xine_get_param(m_xineStream, muteParam)) + { + xine_set_param(m_xineStream, muteParam, 0); /* mute off */ +- emit signalXinetqStatus(i18n("Mute Off")); ++ emit signalXineStatus(i18n("Mute Off")); + } + else + { + xine_set_param(m_xineStream, muteParam, 1); /* mute on */ +- emit signalXinetqStatus(i18n("Mute On")); ++ emit signalXineStatus(i18n("Mute On")); + } + } + +@@ -2867,7 +2867,7 @@ void KXineWidget::slotStop() + TQTimer::singleShot(0, this, TQT_SLOT(slotPlay())); + } + +- emit signalXinetqStatus(i18n("Stop")); ++ emit signalXineStatus(i18n("Stop")); + } + + void KXineWidget::slotSetAudiocdDevice(const TQString& device) +@@ -2997,7 +2997,7 @@ void KXineWidget::slotSpeedPause() + xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE); + m_posTimer.stop(); + if (m_currentSpeed != Undefined) +- emit signalXinetqStatus(i18n("Pause")); ++ emit signalXineStatus(i18n("Pause")); + m_currentSpeed = Pause; + } + } +@@ -3007,7 +3007,7 @@ void KXineWidget::slotSpeedNormal() + xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_NORMAL); + m_posTimer.start(200); + m_currentSpeed = Normal; +- emit signalXinetqStatus(i18n("Playing") + " "); ++ emit signalXineStatus(i18n("Playing") + " "); + } + + void KXineWidget::slotSpeedFaster() +@@ -3018,7 +3018,7 @@ void KXineWidget::slotSpeedFaster() + { + xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_FAST_4); + m_currentSpeed = Fast2; +- emit signalXinetqStatus(i18n("Fast Forward %1").tqarg("x2")); ++ emit signalXineStatus(i18n("Fast Forward %1").tqarg("x2")); + break; + } + case Fast2: +@@ -3035,14 +3035,14 @@ void KXineWidget::slotSpeedFaster() + { + xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_SLOW_2); + m_currentSpeed = Slow1; +- emit signalXinetqStatus(i18n("Slow Motion %1").tqarg("x1")); ++ emit signalXineStatus(i18n("Slow Motion %1").tqarg("x1")); + break; + } + default: + { + xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_FAST_2); + m_currentSpeed = Fast1; +- emit signalXinetqStatus(i18n("Fast Forward %1").tqarg("x1")); ++ emit signalXineStatus(i18n("Fast Forward %1").tqarg("x1")); + break; + } + } +@@ -3056,7 +3056,7 @@ void KXineWidget::slotSpeedSlower() + { + xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_SLOW_4); + m_currentSpeed = Slow2; +- emit signalXinetqStatus(i18n("Slow Motion %1").tqarg("x2")); ++ emit signalXineStatus(i18n("Slow Motion %1").tqarg("x2")); + break; + } + case Slow2: +@@ -3073,14 +3073,14 @@ void KXineWidget::slotSpeedSlower() + { + xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_FAST_2); + m_currentSpeed = Fast1; +- emit signalXinetqStatus(i18n("Fast Forward %1").tqarg("x1")); ++ emit signalXineStatus(i18n("Fast Forward %1").tqarg("x1")); + break; + } + default: + { + xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_SLOW_2); + m_currentSpeed = Slow1; +- emit signalXinetqStatus(i18n("Slow Motion %1").tqarg("x1")); ++ emit signalXineStatus(i18n("Slow Motion %1").tqarg("x1")); + break; + } + } +@@ -3343,31 +3343,31 @@ void KXineWidget::slotToggleDeinterlace() + void KXineWidget::slotAspectRatioAuto() + { + xine_set_param(m_xineStream, XINE_PARAM_VO_ASPECT_RATIO, XINE_VO_ASPECT_AUTO); +- emit signalXinetqStatus(i18n("Aspect Ratio") + ": " + i18n("Auto")); ++ emit signalXineStatus(i18n("Aspect Ratio") + ": " + i18n("Auto")); + } + + void KXineWidget::slotAspectRatio4_3() + { + xine_set_param(m_xineStream, XINE_PARAM_VO_ASPECT_RATIO, XINE_VO_ASPECT_4_3); +- emit signalXinetqStatus(i18n("Aspect Ratio") + ": " + i18n("4:3")); ++ emit signalXineStatus(i18n("Aspect Ratio") + ": " + i18n("4:3")); + } + + void KXineWidget::slotAspectRatioAnamorphic() + { + xine_set_param(m_xineStream, XINE_PARAM_VO_ASPECT_RATIO, XINE_VO_ASPECT_ANAMORPHIC); +- emit signalXinetqStatus(i18n("Aspect Ratio") + ": " + i18n("16:9")); ++ emit signalXineStatus(i18n("Aspect Ratio") + ": " + i18n("16:9")); + } + + void KXineWidget::slotAspectRatioSquare() + { + xine_set_param(m_xineStream, XINE_PARAM_VO_ASPECT_RATIO, XINE_VO_ASPECT_SQUARE); +- emit signalXinetqStatus(i18n("Aspect Ratio") + ": " + i18n("1:1")); ++ emit signalXineStatus(i18n("Aspect Ratio") + ": " + i18n("1:1")); + } + + void KXineWidget::slotAspectRatioDVB() + { + xine_set_param(m_xineStream, XINE_PARAM_VO_ASPECT_RATIO, XINE_VO_ASPECT_DVB); +- emit signalXinetqStatus(i18n("Aspect Ratio") + ": " + i18n("2.11:1")); ++ emit signalXineStatus(i18n("Aspect Ratio") + ": " + i18n("2.11:1")); + } + + void KXineWidget::slotZoomOutX() +@@ -3376,7 +3376,7 @@ void KXineWidget::slotZoomOutX() + { + m_currentZoomX -= 5; + xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_X, m_currentZoomX); +- emit signalXinetqStatus(i18n("Zoom X") + ": " + TQString::number(m_currentZoomX) + "%"); ++ emit signalXineStatus(i18n("Zoom X") + ": " + TQString::number(m_currentZoomX) + "%"); + } + } + +@@ -3386,7 +3386,7 @@ void KXineWidget::slotZoomInX() + { + m_currentZoomX += 5; + xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_X, m_currentZoomX); +- emit signalXinetqStatus(i18n("Zoom X") + ": " + TQString::number(m_currentZoomX) + "%"); ++ emit signalXineStatus(i18n("Zoom X") + ": " + TQString::number(m_currentZoomX) + "%"); + } + } + +@@ -3396,7 +3396,7 @@ void KXineWidget::slotZoomOutY() + { + m_currentZoomY -= 5; + xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_Y, m_currentZoomY); +- emit signalXinetqStatus(i18n("Zoom Y") + ": " + TQString::number(m_currentZoomY) + "%"); ++ emit signalXineStatus(i18n("Zoom Y") + ": " + TQString::number(m_currentZoomY) + "%"); + } + } + +@@ -3406,7 +3406,7 @@ void KXineWidget::slotZoomInY() + { + m_currentZoomY += 5; + xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_Y, m_currentZoomY); +- emit signalXinetqStatus(i18n("Zoom Y") + ": " + TQString::number(m_currentZoomY) + "%"); ++ emit signalXineStatus(i18n("Zoom Y") + ": " + TQString::number(m_currentZoomY) + "%"); + } + } + +@@ -3418,7 +3418,7 @@ void KXineWidget::slotZoomOut() + m_currentZoomX = m_currentZoomY = m_currentZoom; + xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_X, m_currentZoom); + xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_Y, m_currentZoom); +- emit signalXinetqStatus(i18n("Zoom") + ": " + TQString::number(m_currentZoom) + "%"); ++ emit signalXineStatus(i18n("Zoom") + ": " + TQString::number(m_currentZoom) + "%"); + } + } + +@@ -3430,7 +3430,7 @@ void KXineWidget::slotZoomIn() + m_currentZoomX = m_currentZoomY = m_currentZoom; + xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_X, m_currentZoom); + xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_Y, m_currentZoom); +- emit signalXinetqStatus(i18n("Zoom") + ": " + TQString::number(m_currentZoom) + "%"); ++ emit signalXineStatus(i18n("Zoom") + ": " + TQString::number(m_currentZoom) + "%"); + } + } + +@@ -3440,7 +3440,7 @@ void KXineWidget::slotZoomOff() + xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_Y, 100); + m_currentZoom = 100; + m_currentZoomX = m_currentZoomY = m_currentZoom; +- emit signalXinetqStatus(i18n("Zoom") + ": " + TQString::number(m_currentZoom) + "%"); ++ emit signalXineStatus(i18n("Zoom") + ": " + TQString::number(m_currentZoom) + "%"); + } + + TQTime KXineWidget::getLengthInfo() +@@ -3513,37 +3513,37 @@ void KXineWidget::getspuOffset(int& spuOffset) const + void KXineWidget::slotSetHue(int hue) + { + xine_set_param(m_xineStream, XINE_PARAM_VO_HUE, hue); +- emit signalXinetqStatus(i18n("Hue") + ": " + TQString::number((hue*100)/65535) + "%"); ++ emit signalXineStatus(i18n("Hue") + ": " + TQString::number((hue*100)/65535) + "%"); + } + + void KXineWidget::slotSetSaturation(int sat) + { + xine_set_param(m_xineStream, XINE_PARAM_VO_SATURATION, sat); +- emit signalXinetqStatus(i18n("Saturation") + ": " + TQString::number((sat*100)/65535) + "%"); ++ emit signalXineStatus(i18n("Saturation") + ": " + TQString::number((sat*100)/65535) + "%"); + } + + void KXineWidget::slotSetContrast(int contrast) + { + xine_set_param(m_xineStream, XINE_PARAM_VO_CONTRAST, contrast); +- emit signalXinetqStatus(i18n("Contrast") + ": " + TQString::number((contrast*100)/65535) + "%"); ++ emit signalXineStatus(i18n("Contrast") + ": " + TQString::number((contrast*100)/65535) + "%"); + } + + void KXineWidget::slotSetBrightness(int bright) + { + xine_set_param(m_xineStream, XINE_PARAM_VO_BRIGHTNESS, bright); +- emit signalXinetqStatus(i18n("Brightness") + ": " + TQString::number((bright*100)/65535) + "%"); ++ emit signalXineStatus(i18n("Brightness") + ": " + TQString::number((bright*100)/65535) + "%"); + } + + void KXineWidget::slotSetAVOffset(int av) + { + xine_set_param(m_xineStream, XINE_PARAM_AV_OFFSET, av); +- emit signalXinetqStatus(i18n("Audio/Video Offset") + ": " + TQString::number(av/90) + i18n("msec")); ++ emit signalXineStatus(i18n("Audio/Video Offset") + ": " + TQString::number(av/90) + i18n("msec")); + } + + void KXineWidget::slotSetSpuOffset(int spu) + { + xine_set_param(m_xineStream, XINE_PARAM_SPU_OFFSET, spu); +- emit signalXinetqStatus(i18n("Subtitle Offset") + ": " + TQString::number(spu/90) + i18n("msec")); ++ emit signalXineStatus(i18n("Subtitle Offset") + ": " + TQString::number(spu/90) + i18n("msec")); + } + + +diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.h b/kaffeine/src/player-parts/xine-part/kxinewidget.h +index 1ec989a..62fef7c 100644 +--- a/kaffeine/src/player-parts/xine-part/kxinewidget.h ++++ b/kaffeine/src/player-parts/xine-part/kxinewidget.h +@@ -192,7 +192,7 @@ signals: + void signalXineFatal(const TQString& message); /** initXine() not successfull! **/ + void signalXineError(const TQString& message); + void signalXineMessage(const TQString& message); +- void signalXinetqStatus(const TQString& status); ++ void signalXineStatus(const TQString& status); + void signalXineReady(); + void signalXinePlaying(); + +diff --git a/kaffeine/src/player-parts/xine-part/postfilter.cpp b/kaffeine/src/player-parts/xine-part/postfilter.cpp +index a54cdd5..8a691b8 100644 +--- a/kaffeine/src/player-parts/xine-part/postfilter.cpp ++++ b/kaffeine/src/player-parts/xine-part/postfilter.cpp +@@ -50,7 +50,7 @@ PostFilter::PostFilter(const TQString& name, xine_t* engine, xine_audio_port_t* + xine_post_in_t* inputAPI = NULL; + + m_groupBox = new TQGroupBox(name, parent); +- m_groupBox->tqsetSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed)); ++ m_groupBox->setSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed)); + TQGridLayout* grid = new TQGridLayout(m_groupBox, 2, 2); + grid->setMargin( 20 ); + grid->setSpacing( 5 ); +@@ -147,7 +147,7 @@ PostFilter::PostFilter(const TQString& name, xine_t* engine, xine_audio_port_t* + } + + descr = new TQLabel(TQString::fromUtf8(m_xinePostParameter->description ), m_groupBox); +- descr->tqsetAlignment(TQLabel::WordBreak | TQLabel::AlignVCenter); ++ descr->setAlignment(TQLabel::WordBreak | TQLabel::AlignVCenter); + grid->addWidget(descr, row, 1); + row++; + m_xinePostParameter++; +@@ -157,14 +157,14 @@ PostFilter::PostFilter(const TQString& name, xine_t* engine, xine_audio_port_t* + grid->addMultiCellWidget(sep, row, row, 0, 1); + row++; + KPushButton* deleteButton = new KPushButton(i18n("Delete Filter"), m_groupBox); +- deleteButton->tqsetSizePolicy (TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed)); ++ deleteButton->setSizePolicy (TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed)); + connect(deleteButton, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotDeletePressed())); + grid->addWidget(deleteButton, row, 0); + + if(inputAPI) + { + KPushButton* helpButton = new KPushButton(i18n("Help"), m_groupBox); +- helpButton->tqsetSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed)); ++ helpButton->setSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed)); + connect(helpButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotHelpPressed())); + grid->addWidget(helpButton, row, 1); + } +diff --git a/kaffeine/src/player-parts/xine-part/videosettings.cpp b/kaffeine/src/player-parts/xine-part/videosettings.cpp +index 955efcf..c64f627 100644 +--- a/kaffeine/src/player-parts/xine-part/videosettings.cpp ++++ b/kaffeine/src/player-parts/xine-part/videosettings.cpp +@@ -48,7 +48,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright, + videoGrid->setMargin(10); + + TQLabel* hueText = new TQLabel(i18n("Hue"), videoGroup); +- hueText->tqsetAlignment(AlignRight); ++ hueText->setAlignment(AlignRight); + m_hueSlider = new TQSlider(Qt::Horizontal, videoGroup); + m_hueSlider->setRange(0, 65535); + m_hueSlider->setSteps(10, 1000); +@@ -58,7 +58,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright, + videoGrid->addWidget(m_hueSlider, 0, 1); + + TQLabel* satText = new TQLabel(i18n("Saturation"), videoGroup); +- satText->tqsetAlignment(AlignRight); ++ satText->setAlignment(AlignRight); + m_satSlider = new TQSlider(Qt::Horizontal, videoGroup); + m_satSlider->setRange(0, 65535); + m_satSlider->setSteps(10, 1000); +@@ -68,7 +68,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright, + videoGrid->addWidget(m_satSlider, 1, 1); + + TQLabel* contrastText = new TQLabel(i18n("Contrast"), videoGroup); +- contrastText->tqsetAlignment(AlignRight); ++ contrastText->setAlignment(AlignRight); + m_contrastSlider = new TQSlider(Qt::Horizontal, videoGroup); + m_contrastSlider->setRange(0, 65535); + m_contrastSlider->setSteps(10, 1000); +@@ -78,7 +78,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright, + videoGrid->addWidget(m_contrastSlider, 2, 1); + + TQLabel* brightText = new TQLabel(i18n("Brightness"), videoGroup); +- brightText->tqsetAlignment(AlignRight); ++ brightText->setAlignment(AlignRight); + m_brightSlider = new TQSlider(Qt::Horizontal, videoGroup); + m_brightSlider->setRange(0, 65535); + m_brightSlider->setSteps(10, 1000); +@@ -88,7 +88,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright, + videoGrid->addWidget(m_brightSlider, 3, 1); + + TQLabel* avOffsetText = new TQLabel(i18n("Audio/Video Offset"), videoGroup); +- avOffsetText->tqsetAlignment(AlignRight); ++ avOffsetText->setAlignment(AlignRight); + m_avOffsetSlider = new TQSlider(Qt::Horizontal, videoGroup); + m_avOffsetSlider->setRange(-90000, 90000); // +/- 1 sec + m_avOffsetSlider->setSteps(100, 10000); +@@ -98,7 +98,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright, + videoGrid->addWidget(m_avOffsetSlider, 4, 1); + + TQLabel* spuOffsetText = new TQLabel(i18n("Subtitle Offset"), videoGroup); +- spuOffsetText->tqsetAlignment(AlignRight); ++ spuOffsetText->setAlignment(AlignRight); + m_spuOffsetSlider = new TQSlider(Qt::Horizontal, videoGroup); + m_spuOffsetSlider->setRange(-90000, 90000); // +/- 1 sec + m_spuOffsetSlider->setSteps(100, 10000); +diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp +index 9991f1c..f9b3fb1 100644 +--- a/kaffeine/src/player-parts/xine-part/xine_part.cpp ++++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp +@@ -1058,7 +1058,7 @@ void XinePart::slotMessage(const TQString& message) + KMessageBox::information(0, msg, i18n("xine Message")); + } + +-void XinePart::slottqStatus(const TQString& status) ++void XinePart::slotStatus(const TQString& status) + { + emit setStatusBarText(status); + if ((status != i18n("Ready")) && (status != i18n("Playing"))) +@@ -1442,7 +1442,7 @@ void XinePart::initActions() + (m_playTime, i18n("Short click: Toggle Timer Forward/Backward\nLong click: Toggle Timer OSD")); + TQFontMetrics met(KGlobalSettings::generalFont()); + m_playTime->setFixedWidth(met.width("-55:55:55") + 6); +- m_playTime->tqsetSizePolicy(TQSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed)); ++ m_playTime->setSizePolicy(TQSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed)); + m_playTime->setFocusPolicy(TQ_NoFocus); + new KWidgetAction(m_playTime, i18n("Playtime"), 0, 0, 0, actionCollection(), "player_playtime"); + connect(m_playTime, TQT_SIGNAL(pressed()), TQT_TQOBJECT(this), TQT_SLOT(slotButtonTimerPressed())); +@@ -1473,7 +1473,7 @@ void XinePart::initConnections() + this, TQT_SLOT(slotChannelInfo(const TQStringList&, const TQStringList&, int, int ))); + connect(m_xine, TQT_SIGNAL(signalXinePlaying()), TQT_TQOBJECT(this), TQT_SLOT(slotTrackPlaying())); + connect(m_xine, TQT_SIGNAL(signalNewPosition(int, const TQTime&)), TQT_TQOBJECT(this), TQT_SLOT(slotNewPosition(int, const TQTime&))); +- connect(m_xine, TQT_SIGNAL(signalXinetqStatus(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slottqStatus(const TQString&))); ++ connect(m_xine, TQT_SIGNAL(signalXineStatus(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotStatus(const TQString&))); + connect(m_xine, TQT_SIGNAL(signalXineError(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotError(const TQString&))); + connect(m_xine, TQT_SIGNAL(signalXineMessage(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotMessage(const TQString&))); + connect(m_xine, TQT_SIGNAL(signalPlaybackFinished()), TQT_TQOBJECT(this), TQT_SLOT(slotPlaybackFinished())); +diff --git a/kaffeine/src/player-parts/xine-part/xine_part.h b/kaffeine/src/player-parts/xine-part/xine_part.h +index 78c809e..07bf027 100644 +--- a/kaffeine/src/player-parts/xine-part/xine_part.h ++++ b/kaffeine/src/player-parts/xine-part/xine_part.h +@@ -169,7 +169,7 @@ private slots: + void slotConfigXine(); + void slotError(const TQString&); + void slotMessage(const TQString&); +- void slottqStatus(const TQString&); ++ void slotStatus(const TQString&); + void slotNewTitle(); + void slotNewLength(); + void slotNewFrameSize(); +@@ -206,7 +206,7 @@ private: + TQPoint m_oldPosition; + TQTimer m_posCheckTimer; + TQTimer m_osdTimerEnabler; /* Provide Long click on timer button */ +- bool m_isOsdTimer; /* tqStatus of Osd Timer (on/off) */ ++ bool m_isOsdTimer; /* Status of Osd Timer (on/off) */ + int m_timerDirection; /* Counting Up or Down */ + int m_brightness, m_hue, m_contrast, m_saturation; + +diff --git a/kaffeine/src/player-parts/xine-part/xineconfig.cpp b/kaffeine/src/player-parts/xine-part/xineconfig.cpp +index 277a850..74076e4 100644 +--- a/kaffeine/src/player-parts/xine-part/xineconfig.cpp ++++ b/kaffeine/src/player-parts/xine-part/xineconfig.cpp +@@ -132,7 +132,7 @@ XineConfigEntry::XineConfigEntry(TQWidget* parent, TQGridLayout* grid, int row, + m_keyName.remove( 0, m_keyName.find(".") + 1 ); + + TQLabel* description = new TQLabel(m_keyName + "\n" + TQString::fromLocal8Bit(entry->description), parent); +- description->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter ); ++ description->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter ); + grid->addWidget(description, row, 1); + + KSeparator* separator = new KSeparator(Qt::Horizontal, parent); +diff --git a/kaffeine/src/pref.cpp b/kaffeine/src/pref.cpp +index 0544d35..4359f15 100644 +--- a/kaffeine/src/pref.cpp ++++ b/kaffeine/src/pref.cpp +@@ -141,7 +141,7 @@ KaffeinePreferences::KaffeinePreferences() : KDialogBase(IconList,i18n("Kaffeine + gb = new TQGroupBox( "", misc ); + grid = new TQGridLayout( gb, 1, 1, 20, 6 ); + KPushButton* clearRecent = new KPushButton( i18n("Clear"), gb); +- clearRecent->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed)); ++ clearRecent->setSizePolicy( TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed)); + connect(clearRecent, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(signalClearRecent())); + grid->addWidget(clearRecent, 0, 0); + TQLabel* clearLabel = new TQLabel(i18n("Clear recent files list"), gb); +diff --git a/kaffeine/src/startwindow.cpp b/kaffeine/src/startwindow.cpp +index 20a5941..a86696e 100644 +--- a/kaffeine/src/startwindow.cpp ++++ b/kaffeine/src/startwindow.cpp +@@ -66,7 +66,7 @@ SLabel::SLabel( TQWidget *parent ) : TQLabel( parent ) + void SLabel::paintEvent( TQPaintEvent *pe ) + { + TQLabel::paintEvent( pe ); +- TQColorGroup cg = parentWidget()->tqcolorGroup(); ++ TQColorGroup cg = parentWidget()->colorGroup(); + TQColor base = cg.base(); + TQColor selection = cg.highlight(); + int r = (base.red() + selection.red()) / 2; +@@ -92,7 +92,7 @@ StartWindow::StartWindow(TQWidget* parent, const char* name) : TQWidget(parent, + + panel = new TQWidget( this ); + panel->setPaletteBackgroundColor(TQColor("White")); +- panel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) ); ++ panel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) ); + + buttons.setAutoDelete( true ); + } +@@ -118,7 +118,7 @@ void StartWindow::registerTarget( const TQString& uiName, const TQString& pixNam + btn->setTextPosition( TQToolButton::Under ); + btn->setUsesTextLabel( true ); + btn->setIconSet( KGlobal::iconLoader()->loadIconSet(pixName, KIcon::Panel) ); +- TQSize size = btn->tqsizeHint(); ++ TQSize size = btn->sizeHint(); + size.setHeight( size.height()+5 ); + btn->resize( size ); + connect( btn, TQT_SIGNAL(executed(const TQString&)), this, TQT_SIGNAL(execTarget(const TQString&)) ); +diff --git a/kaffeine/src/systemtray.cpp b/kaffeine/src/systemtray.cpp +index 79028aa..745360f 100644 +--- a/kaffeine/src/systemtray.cpp ++++ b/kaffeine/src/systemtray.cpp +@@ -72,7 +72,7 @@ SystemTray::SystemTray(TQWidget *parent, const char *name ) : KSystemTray(parent + m_osd = new TitleLabel; + m_osd->setFrameStyle(TQFrame::Panel | TQFrame::Plain); + m_osd->setLineWidth(1); +- m_osd->tqsetAlignment(SingleLine); ++ m_osd->setAlignment(SingleLine); + connect(&m_hideTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotHideOSD())); + + setPixmap(KGlobal::iconLoader()->loadIcon("kaffeine", KIcon::Panel, 22)); diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13-renames_a_few_stragglers.patch b/redhat/applications/kaffeine/kaffeine-3.5.13-renames_a_few_stragglers.patch new file mode 100644 index 000000000..b3fcbc792 --- /dev/null +++ b/redhat/applications/kaffeine/kaffeine-3.5.13-renames_a_few_stragglers.patch @@ -0,0 +1,30 @@ +commit 89b5fd35299d63e54cb2b36ec366d0071381458b +Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Date: 1324748015 -0600 + + Rename a few stragglers + +diff --git a/kaffeine/src/kmultitabbar.cpp b/kaffeine/src/kmultitabbar.cpp +index 4ff1154..8d85e01 100644 +--- a/kaffeine/src/kmultitabbar.cpp ++++ b/kaffeine/src/kmultitabbar.cpp +@@ -654,8 +654,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) { + + if (down) st|=TQStyle::Style_On; + +- tqstyle().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st); +- tqstyle().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st); ++ style().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st); ++ style().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st); + + switch (m_position) { + case KMultiTabBar::Left: +@@ -671,7 +671,7 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) { + paint->drawPixmap(0,0,pixmap); + break; + } +-// tqstyle().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), ++// style().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), + // colorGroup(),TQStyle::Style_Enabled); + + diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13-work_around_xine_crash.patch b/redhat/applications/kaffeine/kaffeine-3.5.13-work_around_xine_crash.patch new file mode 100644 index 000000000..51948d795 --- /dev/null +++ b/redhat/applications/kaffeine/kaffeine-3.5.13-work_around_xine_crash.patch @@ -0,0 +1,14 @@ +commit 508cb342d8f88e9a1d25d6aec78a43b7050b4e85 +Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Date: 1330032748 -0600 + + Work around Xine crash when displaying still logo image by creating a small movie file to replace it + This closes Bug 559 + +diff --git a/kaffeine/images/logo b/kaffeine/images/logo +index f3d53e2..7b76dfe 100644 +Binary files a/kaffeine/images/logo and b/kaffeine/images/logo differ +diff --git a/kaffeine/images/logo.still b/kaffeine/images/logo.still +new file mode 100644 +index 0000000..f3d53e2 +Binary files /dev/null and b/kaffeine/images/logo.still differ diff --git a/redhat/applications/kaffeine/trinity-kaffeine.spec b/redhat/applications/kaffeine/trinity-kaffeine.spec index bab8aa4ab..41669667a 100644 --- a/redhat/applications/kaffeine/trinity-kaffeine.spec +++ b/redhat/applications/kaffeine/trinity-kaffeine.spec @@ -1,12 +1,12 @@ # Default version for this component %define kdecomp kaffeine %define version 0.8.8 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc +%define _docdir %{_datadir}/doc %define _mandir %{_datadir}/man %endif @@ -33,12 +33,28 @@ Source2: kaffeine.1 # [kaffeine] Work around Xine crash when displaying still logo image by creating a small movie file to replace it [Bug #511, #559] Source1: 508cb342-logo -# [kaffeine] Fix nominal "tqt" typos and fix slow DVB start. This closes bug reports 729 and 899. -Patch1: 1331343133:fd68e4c4940afb4529b16e2c3e3d0f379ac7b161.diff -# [kaffeine] Change location where Kaffeine stores temporary pipe files from $HOME to the more appropriate $KDEHOME/tmp-$HOSTNAME. -Patch2: 1331957353:b480e3db3a01b75376fa6b83e5b01efe104ccaec.diff -# [kaffeine] Fix typos, branding, and inadvertent tqt changes. -Patch3: 1333649519:0e3d0ed603c6c8065fdcb77bc79b59a768fc6a5b.diff + + +# [kaffeine] Rename old tq methods that no longer need a unique name[Commit #60ed202f] +Patch1: kaffeine-3.5.13-rename_old_tq_methods.patch +# [kaffeine] Remove additional unneeded tq method conversions [Commit #701a1249] +Patch2: kaffeine-3.5.13-remove_additional_tq_conversions.patch +# [kaffeine] Rename obsolete tq methods to standard names [Commit #66805baf] +Patch3: kaffeine-3.5.13-rename_obsolete_tq_methods.patch +# [kaffeine] Rename a few stragglers [Commit #89b5fd35] +Patch4: kaffeine-3.5.13-renames_a_few_stragglers.patch +# [kaffeine] Error out if critical OSD-related defines are not set [Commit #25b89439] +Patch5: kaffeine-3.5.13-error_out_if_critical_osd_defines_not_set.patch +# [kaffeine] Work around Xine crash when displaying still logo image by creating a small movie file to replace it [Bug #559, #511] [Commit #508cb342] +Patch6: kaffeine-3.5.13-work_around_xine_crash.patch +# [kaffeine] Fix nominal "tqt" typos and fix slow DVB start. [Bug #729, #899] [Commit #fd68e4c4] +Patch7: kaffeine-3.5.13-fix_slow_dvb_start.patch +# [kaffeine] Change location where Kaffeine stores temporary pipe files from $HOME to the more appropriate $TDEHOME/tmp-$HOSTNAME. [Commit #b480e3db] +Patch8: kaffeine-3.5.13-fix_temporary_location.patch +# [kaffeine] Fix typos, branding, and inadvertent tqt changes. [Commit #0e3d0ed6] +Patch9: kaffeine-3.5.13-fix_typos_branding_tqt.patch +# [kaffeine] Fix installation of localization files [Bug #858] +Patch10: kaffeine-3.5.13-fix_localization_files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -212,6 +228,10 @@ update-desktop-database >& /dev/null ||: %changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-2 +- Rebuilt for Fedora 17 +- Adds more patches from GIT. + * Mon Apr 23 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-1 - Updates version to 0.8.8 - Fix nominal "tqt" typos and fix slow DVB start. [Bug #729, #899] diff --git a/redhat/applications/katapult/trinity-katapult-3.5.12.spec b/redhat/applications/katapult/trinity-katapult-3.5.12.spec new file mode 100644 index 000000000..4f1b16493 --- /dev/null +++ b/redhat/applications/katapult/trinity-katapult-3.5.12.spec @@ -0,0 +1,120 @@ +# Default version for this component +%define kdecomp katapult +%define version 0.3.2.1 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.12 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir} +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/kde3 + + +Name: trinity-%{kdecomp} +Summary: Faster access to applications, bookmarks, and other items. +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ + +Source0: %{kdecomp}-3.5.12.tar.gz +Patch0: katapult-0.3.2.1_to_0.3.2.2.patch + +# TQt4 port Katapult. This enables compilation under both Qt3 and Qt4. +Patch1: r1233929.diff + + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils + +%description +Katapult is an application for KDE, designed to allow faster access to +applications, bookmarks, and other items. It is plugin-based, so it can +launch anything that is has a plugin for. Its display is driven by +plugins as well, so its appearance is completely customizable. It was +inspired by Quicksilver for OS X. + + +%prep +%setup -q -n applications/%{kdecomp} +%patch0 -p1 +#patch1 -p2 + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +export CXXFLAGS="-DTQ_OBJECT=//" + +chmod +x ./configure + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt \ + --enable-closure + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%make_install + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +/sbin/ldconfig + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +/sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{_bindir}/* +%{_datadir}/applications/*/*.desktop +%{_datadir}/icons/*/*/*/* +%{_datadir}/locale/*/*/*.mo +%{_datadir}/services/*.desktop +%{_datadir}/servicetypes/*.desktop +%{tde_libdir}/*.so +%{_libdir}/*.so.* +%{tde_docdir}/HTML/en/katapult + + +%exclude %{tde_libdir}/*.la +%exclude %{_libdir}/*.so +%exclude %{_libdir}/*.la + +%Changelog +* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-1 +- Initial build for RHEL 6.0 +- Import to GIT + diff --git a/redhat/applications/katapult/trinity-katapult-3.5.13.spec b/redhat/applications/katapult/trinity-katapult-3.5.13.spec index c746befce..9f745b2f2 100644 --- a/redhat/applications/katapult/trinity-katapult-3.5.13.spec +++ b/redhat/applications/katapult/trinity-katapult-3.5.13.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp katapult %define version 0.3.2.1 -%define release 3 +%define release 4 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -53,12 +53,12 @@ inspired by Quicksilver for OS X. # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__make -f admin/Makefile.common %build @@ -84,13 +84,17 @@ export PATH="%{_bindir}:${PATH}" %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done /sbin/ldconfig %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done /sbin/ldconfig @@ -99,7 +103,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %doc AUTHORS COPYING %{_bindir}/* %{_datadir}/applications/*/*.desktop -%{_datadir}/icons/*/*/*/* +%{_datadir}/icons/crystalsvg/*/*/* +%{_datadir}/icons/hicolor/*/*/* %{_datadir}/locale/*/*/*.mo %{_datadir}/services/*.desktop %{_datadir}/servicetypes/*.desktop @@ -113,6 +118,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %exclude %{_libdir}/*.la %Changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-4 +- Rebuilt for Fedora 17 +- Fix post and postun + * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-3 - Fix HTML directory location diff --git a/redhat/applications/kbarcode/trinity-kbarcode.spec b/redhat/applications/kbarcode/trinity-kbarcode.spec index 4af036bb6..507e0b1a5 100644 --- a/redhat/applications/kbarcode/trinity-kbarcode.spec +++ b/redhat/applications/kbarcode/trinity-kbarcode.spec @@ -66,12 +66,12 @@ to use them in another application. # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__make -f admin/Makefile.common %build diff --git a/redhat/applications/kbookreader/trinity-kbookreader-3.5.13.spec b/redhat/applications/kbookreader/trinity-kbookreader-3.5.13.spec index 1157fc5ff..03b1a7779 100644 --- a/redhat/applications/kbookreader/trinity-kbookreader-3.5.13.spec +++ b/redhat/applications/kbookreader/trinity-kbookreader-3.5.13.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kbookreader %define version 0.2.0 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -51,12 +51,13 @@ within the Trinity Desktop Environment. # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__make -f admin/Makefile.common %build @@ -118,11 +119,16 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_datadir}/applnk/*/*.desktop %{_datadir}/apps/*/ %{_datadir}/config.kcfg/* -%{_docdir}/HTML/en/*/ -%{_datadir}/icons/*/*/*/* +%{tde_docdir}/HTML/en/*/ +%{_datadir}/icons/hicolor/*/*/* %Changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.2.0-2 +- Rebuilt for Fedora 17 +- Fix post and postun +- Fix HTML directory location + * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.2.0-1 - Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/kchmviewer/trinity-kchmviewer.spec b/redhat/applications/kchmviewer/trinity-kchmviewer.spec index c322597fc..5b1c28d58 100644 --- a/redhat/applications/kchmviewer/trinity-kchmviewer.spec +++ b/redhat/applications/kchmviewer/trinity-kchmviewer.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kchmviewer %define version 3.1.2 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -66,11 +66,12 @@ support. Correctly detects and shows encoding of any valid chm file. # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -86,9 +87,6 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}" --with-extra-includes=%{_includedir}/tqt \ --enable-closure -# --with-qt-dir=${QTDIR} \ -# --with-qt-includes=${QTINC} \ -# --with-qt-libraries=${QTLIB} \ %__make %{?_smp_mflags} @@ -105,12 +103,12 @@ export PATH="%{_bindir}:${PATH}" %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/crystalsvg || : +gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/crystalsvg || : +gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : %files -f %{kdecomp}.lang @@ -127,5 +125,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.1.2-2 +- Rebuilt for Fedora 17 +- Fix post and postun +- Fix HTML directory location + * Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.1.2-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kcpuload/trinity-kcpuload.spec b/redhat/applications/kcpuload/trinity-kcpuload.spec index 67b2c39d1..345381e31 100644 --- a/redhat/applications/kcpuload/trinity-kcpuload.spec +++ b/redhat/applications/kcpuload/trinity-kcpuload.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kcpuload %define version 2.00 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -41,7 +41,7 @@ BuildRequires: gettext %description -KCPULoad is a small program for Kicker (the KDE panel). It shows a +KCPULoad is a small program for Kicker (the TDE panel). It shows a recent history of CPU usage in the form of one or two configurable diagrams in the system tray. These diagrams have settings for colours and various different styles. @@ -54,11 +54,12 @@ KCPULoad has support for SMP and separate user/system loads. # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -84,12 +85,16 @@ export PATH="%{_bindir}:${PATH}" %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in crystalsvg locolor ; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in crystalsvg locolor ; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done %files @@ -97,12 +102,18 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_bindir}/kcpuload %{_datadir}/applnk/System/kcpuload.desktop %{_datadir}/apps/kcpuload/icons/*/*/*/*.png -%{_datadir}/icons/*/*/apps/kcpuload.png -%{_docdir}/HTML/en/kcpuload/common -%{_docdir}/HTML/en/kcpuload/index.cache.bz2 -%{_docdir}/HTML/en/kcpuload/index.docbook +%{_datadir}/icons/crystalsvg/*/apps/kcpuload.png +%{_datadir}/icons/locolor/*/apps/kcpuload.png +%{tde_docdir}/HTML/en/kcpuload/common +%{tde_docdir}/HTML/en/kcpuload/index.cache.bz2 +%{tde_docdir}/HTML/en/kcpuload/index.docbook %Changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.00-2 +- Rebuilt for Fedora 17 +- Fix post and postun +- Fix HTML directory location + * Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 2.00-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec b/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec index 27d2f55e5..83aa3617a 100644 --- a/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec +++ b/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kdbusnotification %define version 0.1 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -56,11 +56,12 @@ DBUS notifications via unobtrusive, easily dismissed passive popups. # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -83,36 +84,10 @@ export PATH="%{_bindir}:${PATH}" -## File lists -# HTML (1.0) -HTML_DIR=$(kde-config --expandvars --install html) -if [ -d %{buildroot}$HTML_DIR ]; then -for lang_dir in %{buildroot}$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common - done - popd - fi -done -fi - - %clean %__rm -rf %{buildroot} -%post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - -%postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %files %defattr(-,root,root,-) @@ -122,5 +97,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.1-2 +- Rebuilt for Fedora 17 +- Fix HTML directory location +- Removes post and postun + * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.1-1 - Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/kde-guidance/trinity-kde-guidance.spec b/redhat/applications/kde-guidance/trinity-kde-guidance.spec index c15b9fd43..f08cd25de 100644 --- a/redhat/applications/kde-guidance/trinity-kde-guidance.spec +++ b/redhat/applications/kde-guidance/trinity-kde-guidance.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp guidance %define version 0.8.0svn20080103 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -18,7 +18,7 @@ BuildRequires: autoconf automake libtool m4 %define __arch_install_post %{nil} Name: trinity-%{kdecomp} -Summary: collection of KDE system administration tools for GNU/Linux [Trinity] +Summary: A collection of system administration tools for Trinity Version: %{?version} Release: %{?release}%{?dist}%{?_variant} @@ -256,14 +256,22 @@ find %{buildroot} -name "*.egg-info" -exec rm -f {} \; %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/crystalsvg || : +gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : /sbin/ldconfig || : %postun +touch --no-create %{_datadir}/icons/crystalsvg || : +gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : +/sbin/ldconfig || : + +%post powermanager +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun powermanager touch --no-create %{_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -/sbin/ldconfig || : %files -f %{kdecomp}.lang @@ -313,5 +321,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-2 +- Rebuilt for Fedora 17 +- Fix post and postun + * Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec b/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec index 6a6dcd028..5883a3d92 100644 --- a/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec +++ b/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kde-style-lipstik %define version 2.2.3 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -16,7 +16,7 @@ BuildRequires: autoconf automake libtool m4 %define tde_libdir %{_libdir}/trinity -Name: trinity-%{kdecomp} +Name: trinity-style-lipstik Summary: Lipstik style for TDE Version: %{?version} Release: %{?release}%{?dist}%{?_variant} @@ -33,6 +33,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz +Obsoletes: trinity-kde-style-lipstik + BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-kdebase-devel @@ -52,11 +54,12 @@ Lipstik also provides Lipstik-color-schemes # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -81,14 +84,6 @@ export PATH="%{_bindir}:${PATH}" %__rm -rf %{buildroot} -%post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - -%postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - %files %defattr(-,root,root,-) @@ -104,5 +99,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.2.3-2 +- Rebuilt for Fedora 17 +- Fix HTML directory location +- Removes post and postun + * Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 2.2.3-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kde-style-qtcurve/trinity-kde-style-qtcurve.spec b/redhat/applications/kde-style-qtcurve/trinity-kde-style-qtcurve.spec index 4995202a2..b52e16305 100644 --- a/redhat/applications/kde-style-qtcurve/trinity-kde-style-qtcurve.spec +++ b/redhat/applications/kde-style-qtcurve/trinity-kde-style-qtcurve.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kde-style-qtcurve %define version 0.55.2 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -16,7 +16,7 @@ BuildRequires: autoconf automake libtool m4 %define tde_libdir %{_libdir}/trinity -Name: trinity-%{kdecomp} +Name: trinity-style-qtcurve Summary: This is a set of widget styles for Trinity based apps Version: %{?version} Release: %{?release}%{?dist}%{?_variant} @@ -41,10 +41,11 @@ BuildRequires: trinity-kdebase-devel BuildRequires: desktop-file-utils BuildRequires: gettext +Obsoletes: trinity-kde-style-qtcurve %description This package together with gtk2-engines-qtcurve aim to provide a unified look -and feel on the desktop when using KDE and Gnome applications. +and feel on the desktop when using TDE and Gnome applications. This package is most useful when installed together with gtk2-engines-qtcurve. @@ -56,8 +57,8 @@ gtk2-engines-qtcurve. # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -sed -i CMakeLists.txt \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" +%__sed -i CMakeLists.txt \ + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" %build @@ -85,14 +86,6 @@ export PATH="%{_bindir}:${PATH}" %__rm -rf %{buildroot} -%post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - -%postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - %files %defattr(-,root,root,-) @@ -114,5 +107,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.55.2-2 +- Rebuilt for Fedora 17 +- Removes post and postun + * Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.55.2-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec b/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec index 8b34131a5..bd19f7746 100644 --- a/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec +++ b/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec @@ -52,12 +52,12 @@ unset QTDIR; . /etc/profile.d/qt.sh # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "admin/acinclude.m4.in" \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" diff --git a/redhat/applications/kdesudo/trinity-kdesudo-3.5.13.spec b/redhat/applications/kdesudo/trinity-kdesudo-3.5.13.spec index 28425aac5..2817ed3db 100644 --- a/redhat/applications/kdesudo/trinity-kdesudo-3.5.13.spec +++ b/redhat/applications/kdesudo/trinity-kdesudo-3.5.13.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kdesudo %define version 2.5.1 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -51,12 +51,14 @@ It allows you to run programs as another user by entering your password. # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" -%__make -f admin/Makefile.common %build unset QTDIR || : ; source /etc/profile.d/qt.sh @@ -100,25 +102,21 @@ fi %__rm -rf %{buildroot} -%post -/sbin/ldconfig -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - -%postun -/sbin/ldconfig -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %files %defattr(-,root,root,-) %{_bindir}/kdesudo -%{_docdir}/HTML/en/kdesudo/common -%{_docdir}/HTML/en/kdesudo/index.cache.bz2 -%{_docdir}/HTML/en/kdesudo/index.docbook +%{tde_docdir}/HTML/en/kdesudo/common +%{tde_docdir}/HTML/en/kdesudo/index.cache.bz2 +%{tde_docdir}/HTML/en/kdesudo/index.docbook %{_datadir}/locale/fr/LC_MESSAGES/kdesudo.mo %Changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.5.1-2 +- Rebuilt for Fedora 17 +- Fix HTML directory location +- Removes post and postun + * Wed Nov 02 2011 Francois Andriot <francois.andriot@free.fr> - 2.5.1-1 - Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/kdesvn/kdesvn-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/kdesvn/kdesvn-3.5.13-fix_gcc47_compilation.patch new file mode 100644 index 000000000..850d5c7c0 --- /dev/null +++ b/redhat/applications/kdesvn/kdesvn-3.5.13-fix_gcc47_compilation.patch @@ -0,0 +1,11 @@ +--- kdesvn/src/kdesvnd/CMakeLists.txt.ORI 2012-05-01 23:53:03.503449741 +0200 ++++ kdesvn/src/kdesvnd/CMakeLists.txt 2012-05-01 23:53:09.754340075 +0200 +@@ -23,7 +23,7 @@ + + SET_TARGET_PROPERTIES(kded_kdesvnd + PROPERTIES +- LINK_FLAGS "${LINK_NO_UNDEFINED} ${_BASE_LDADD} ${APR_EXTRA_LIBFLAGS} ${APU_EXTRA_LIBFLAGS} -module") ++ LINK_FLAGS "${LINK_NO_UNDEFINED} ${_BASE_LDADD} ${APR_EXTRA_LIBFLAGS} ${APU_EXTRA_LIBFLAGS}") + + INSTALL(TARGETS kded_kdesvnd + RUNTIME DESTINATION ${BIN_INSTALL_DIR} diff --git a/redhat/applications/kdesvn/trinity-kdesvn.spec b/redhat/applications/kdesvn/trinity-kdesvn.spec index 20904fd46..7f03c6c33 100644 --- a/redhat/applications/kdesvn/trinity-kdesvn.spec +++ b/redhat/applications/kdesvn/trinity-kdesvn.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kdesvn %define version 1.0.4 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -33,6 +33,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz +# [kdesvn] Fix compilation with GCC 4.7 +Patch1: kdesvn-3.5.13-fix_gcc47_compilation.patch + BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-kdebase-devel @@ -90,6 +93,7 @@ This package is part of tdesvn-trinity. %prep %setup -q -n applications/%{kdecomp} +%patch1 -p1 # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! @@ -137,11 +141,15 @@ export PATH="%{_bindir}:${PATH}" %post touch --no-create %{_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -/sbin/ldconfig || : %postun touch --no-create %{_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%post -n trinity-libsvnqt +/sbin/ldconfig || : + +%postun -n trinity-libsvnqt /sbin/ldconfig || : @@ -192,5 +200,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.4-2 +- Rebuilt for Fedora 17 +- Fix post and postun +- Fix compilation with GCC 4.7 + * Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.4-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec b/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec index a62ea4bda..f98c3d8ff 100644 --- a/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec +++ b/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec @@ -1,12 +1,13 @@ # Default version for this component %define kdecomp kdiff3 %define version 0.9.91 -%define release 3 +%define release 4 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc +%define _docdir %{_datadir}/doc +%define _mandir %{_datadir}/man %endif # TDE 3.5.13 specific building variables @@ -43,7 +44,7 @@ BuildRequires: desktop-file-utils Shows the differences line by line and character by character (!). Provides an automatic merge-facility and an integrated editor for comfortable solving of merge-conflicts. -Supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.). +Supports KIO on TDE (allows accessing ftp, sftp, fish, smb etc.). Unicode & UTF-8 support @@ -52,11 +53,12 @@ Unicode & UTF-8 support # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -83,12 +85,16 @@ export PATH="%{_bindir}:${PATH}" %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in hicolor locolor; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in hicolor locolor; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done %files @@ -96,9 +102,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %doc AUTHORS COPYING %{_bindir}/* %{_datadir}/apps/*/ -%{_datadir}/icons/*/*/*/* +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/icons/locolor/*/*/* %{_datadir}/locale/*/*/*.mo -%{_docdir}/HTML/*/* +%{tde_docdir}/HTML/*/* %{_datadir}/services/*.desktop %{tde_libdir}/*.so %{_datadir}/applnk/Development/*.desktop @@ -108,6 +115,11 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{tde_libdir}/*.la %Changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.91-4 +- Rebuilt for Fedora 17 +- Fix HTML directory location +- Fix post and postun + * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-3 - Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/kdirstat/trinity-kdirstat.spec b/redhat/applications/kdirstat/trinity-kdirstat.spec index 85161eabf..153c4b1a6 100644 --- a/redhat/applications/kdirstat/trinity-kdirstat.spec +++ b/redhat/applications/kdirstat/trinity-kdirstat.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kdirstat %define version 2.4.4 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -57,11 +57,11 @@ own cleanup actions. # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -92,12 +92,16 @@ export PATH="%{_bindir}:${PATH}" %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in hicolor locolor; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in hicolor locolor; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done %files -f %{kdecomp}.lang @@ -108,9 +112,14 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_datadir}/apps/kconf_update/kdirstat.upd %{_datadir}/apps/kdirstat %{tde_docdir}/HTML/en/kdirstat -%{_datadir}/icons/*/*/apps/kdirstat.png +%{_datadir}/icons/hicolor/*/apps/kdirstat.png +%{_datadir}/icons/locolor/*/apps/kdirstat.png %Changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.4.4-2 +- Rebuilt for Fedora 17 +- Fix post and postun + * Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.4.4-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kdmtheme/trinity-kdmtheme.spec b/redhat/applications/kdmtheme/trinity-kdmtheme.spec index 05f4b43a5..e2bd41958 100644 --- a/redhat/applications/kdmtheme/trinity-kdmtheme.spec +++ b/redhat/applications/kdmtheme/trinity-kdmtheme.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kdmtheme %define version 1.2.2 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -32,7 +32,6 @@ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz -Source1: kdmtheme.lintian-overrides BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel @@ -53,11 +52,11 @@ that allows you to easily install, remove and change your KDM themes. # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -77,20 +76,11 @@ export PATH="%{_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%__install -D -p -m644 %{SOURCE1} %{buildroot}%{_datadir}/lintian/overrides/kdmtheme-trinity %clean %__rm -rf %{buildroot} -%post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - -%postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - %files %defattr(-,root,root,-) @@ -100,9 +90,13 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{tde_docdir}/HTML/en/kdmtheme/common %{tde_docdir}/HTML/en/kdmtheme/index.cache.bz2 %{tde_docdir}/HTML/en/kdmtheme/index.docbook -%{_datadir}/lintian/overrides/kdmtheme-trinity %Changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.2-2 +- Rebuilt for Fedora 17 +- Removes post and postun +- Removes the 'lintian' stuff from Debian + * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.2.2-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/keep/trinity-keep.spec b/redhat/applications/keep/trinity-keep.spec index 8b73ec156..2e172e5c4 100644 --- a/redhat/applications/keep/trinity-keep.spec +++ b/redhat/applications/keep/trinity-keep.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp keep %define version 0.4.0 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -53,11 +53,12 @@ Homepage: http://jr.falleri.free.fr/keep # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -106,5 +107,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.0-2 +- Rebuilt for Fedora 17 + * Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.0-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kerry/trinity-kerry.spec b/redhat/applications/kerry/trinity-kerry.spec index 2949edcb4..cfe73a43d 100644 --- a/redhat/applications/kerry/trinity-kerry.spec +++ b/redhat/applications/kerry/trinity-kerry.spec @@ -57,11 +57,12 @@ filesystems, chat logs, mail and data, RSS and other. # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" diff --git a/redhat/applications/kgtk-qt3/trinity-kgtk-qt3.spec b/redhat/applications/kgtk-qt3/trinity-kgtk-qt3.spec index f8ef2b9e1..01ae9369b 100644 --- a/redhat/applications/kgtk-qt3/trinity-kgtk-qt3.spec +++ b/redhat/applications/kgtk-qt3/trinity-kgtk-qt3.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kgtk-qt3 %define version 0.10.2 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -88,17 +88,6 @@ export PATH="%{_bindir}:${PATH}" %__rm -rf %{buildroot} -%post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -/sbin/ldconfig || : - -%postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -/sbin/ldconfig || : - - %files -f kdialogd3.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README TODO @@ -112,5 +101,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.2-2 +- Rebuilt for Fedora 17 +- Removes post and postun + * Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 0.10.2-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kile/trinity-kile.spec b/redhat/applications/kile/trinity-kile.spec index 36c013774..1b106bb88 100644 --- a/redhat/applications/kile/trinity-kile.spec +++ b/redhat/applications/kile/trinity-kile.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kile %define version 2.0.2 -%define release 2 +%define release 3 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -32,7 +32,6 @@ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz -Source1: %{kdecomp}.xpm BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel @@ -446,7 +445,6 @@ export PATH="%{_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%__install -D -p -m0644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/kile.xpm %__chmod +x %{buildroot}%{_datadir}/apps/kile/test/runTests.sh %clean @@ -475,7 +473,6 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_datadir}/icons/hicolor/scalable/apps/kile.svgz %{tde_docdir}/HTML/en/kile %{_datadir}/mimelnk/text/x-kilepr.desktop -%{_datadir}/pixmaps/kile.xpm %files i18n-da %lang(da) %{tde_docdir}/HTML/da/kile @@ -623,6 +620,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-3 +- Rebuilt for Fedora 17 +- Removes the XPM icon + * Fri Apr 20 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-2 - Fix file conflict with trinity-kdelibs diff --git a/redhat/applications/kima/trinity-kima.spec b/redhat/applications/kima/trinity-kima.spec index a6f8e2ab1..9403f857c 100644 --- a/redhat/applications/kima/trinity-kima.spec +++ b/redhat/applications/kima/trinity-kima.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kima %define version 0.7.3.2 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -52,11 +52,11 @@ panel. # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -87,13 +87,9 @@ export PATH="%{_bindir}:${PATH}" %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : /sbin/ldconfig || : %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : /sbin/ldconfig || : @@ -109,5 +105,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-2 +- Rebuilt for Fedora 17 +- Fix post and postun + * Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/kio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch new file mode 100644 index 000000000..2f08804da --- /dev/null +++ b/redhat/applications/kio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch @@ -0,0 +1,22 @@ +--- kio-locate/src/SConscript.ORI 2012-05-02 00:23:36.637608539 +0200 ++++ kio-locate/src/SConscript 2012-05-02 00:23:44.142459165 +0200 +@@ -28,7 +28,7 @@ + pattern.cpp + """ + obj.libs='tqt kio' +-obj.linkflags='-module' # add more link flags ++#obj.linkflags='-module' # add more link flags + obj.execute() + + # Install the protocol files +--- kio-locate/admin/kde.py.ORI 2012-05-02 00:37:55.095993387 +0200 ++++ kio-locate/admin/kde.py 2012-05-02 00:38:34.615142101 +0200 +@@ -781,7 +781,7 @@ + lenv.KDEinstall( 'KDEDOC', lenv.join(lang,destination), lenv.join(folder,'index.cache.bz2') ) + + if env['_INSTALL']: +- dir=lenv.join(lenv.getInstDirForResType('KDEDOC'), lang, destination) ++ dir=lenv.join(env['DESTDIR'], lenv.getInstDirForResType('KDEDOC'), lang, destination) + comp='mkdir -p %s && cd %s && rm -f common && ln -s ../common common' % (dir, dir) + lenv.Execute(comp) + diff --git a/redhat/applications/kio-locate/trinity-kio-locate.spec b/redhat/applications/kio-locate/trinity-kio-locate.spec index 1ff1b119b..7f43664d0 100644 --- a/redhat/applications/kio-locate/trinity-kio-locate.spec +++ b/redhat/applications/kio-locate/trinity-kio-locate.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kio-locate %define version 0.4.5 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -33,6 +33,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz +# [kio-locate] Fix compilation with GCC 4.7 +Patch1: kio-locate-3.5.13-fix_gcc47_compilation.patch BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel @@ -43,7 +45,7 @@ BuildRequires: scons %description Adds support for the "locate:" and "locater:" -protocols to Konqueror and other KDE applications. +protocols to Konqueror and other TDE applications. This enables you to perform locate searches as you would in a terminal. The result is displayed just @@ -51,16 +53,17 @@ as a directory. %prep -unset QTDIR; . /etc/profile.d/qt.sh %setup -q -n applications/%{kdecomp} +%patch1 -p1 # Ugly hack to modify TQT include directory inside SCONS files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/kde.py \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" %build +unset QTDIR; . /etc/profile.d/qt.sh export PATH="%{_bindir}:${PATH}" export LDFLAGS="-L%{_libdir} -I%{_includedir}" scons configure @@ -76,14 +79,6 @@ scons install DESTDIR=%{buildroot} %__rm -rf %{buildroot} -%post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - -%postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - %files %defattr(-,root,root,-) @@ -100,6 +95,11 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.5-2 +- Rebuilt for Fedora 17 +- Removes post and postun +- Fix compilation with GCC 4.7 + * Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.5-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper.spec b/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper.spec index 172f54bf3..350e38237 100644 --- a/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper.spec +++ b/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kio-umountwrapper %define version 0.2 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -52,12 +52,12 @@ unset QTDIR; . /etc/profile.d/qt.sh # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "admin/acinclude.m4.in" \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -83,14 +83,6 @@ export PATH="%{_bindir}:${PATH}" %__rm -rf %{buildroot} -%post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - -%postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - %files %defattr(-,root,root,-) @@ -99,6 +91,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-2 +- Rebuilt for Fedora 17 +- Removes post and postun + * Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.2-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kiosktool/trinity-kiosktool.spec b/redhat/applications/kiosktool/trinity-kiosktool.spec index ec96de232..523f5682e 100644 --- a/redhat/applications/kiosktool/trinity-kiosktool.spec +++ b/redhat/applications/kiosktool/trinity-kiosktool.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kiosktool %define version 1.0 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -47,12 +47,14 @@ groups of users. # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" -%__make -f admin/Makefile.common +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + %build unset QTDIR || : ; source /etc/profile.d/qt.sh @@ -103,13 +105,13 @@ fi %post -touch --no-create %{_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: +touch --no-create %{_datadir}/icons/crystalsvg ||: +gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||: update-desktop-database >& /dev/null ||: %postun -touch --no-create %{_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: +touch --no-create %{_datadir}/icons/crystalsvg ||: +gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||: update-desktop-database >& /dev/null ||: @@ -121,11 +123,15 @@ update-desktop-database >& /dev/null ||: %{_bindir}/kiosktool-kdedirs %{_datadir}/applications/kde/kiosktool.desktop %{_datadir}/apps/kiosktool/*.png -%{_docdir}/HTML/en/kiosktool/ +%{tde_docdir}/HTML/en/kiosktool/ %{_datadir}/icons/crystalsvg/*/apps/kiosktool.png %{_datadir}/apps/kiosktool/kiosk_data.xml %{_datadir}/apps/kiosktool/kiosktoolui.rc %Changelog +* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2 +- Rebuilt for Fedora 17 +- Fix post and postun + * Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/kmplayer/kmplayer-3.5.13-fix_gcc47_compilation.patch new file mode 100644 index 000000000..02962e256 --- /dev/null +++ b/redhat/applications/kmplayer/kmplayer-3.5.13-fix_gcc47_compilation.patch @@ -0,0 +1,45 @@ +commit 5106117b5c1439d3fee08395c1a025f62d30a53e +Author: Darrell Anderson <humanreadable@yahoo.com> +Date: 1335631986 -0500 + + GCC 4.7 fixes. + +diff --git a/src/gstplayer.cpp b/src/gstplayer.cpp +index ebf7b0d..c4bf580 100644 +--- a/src/gstplayer.cpp ++++ b/src/gstplayer.cpp +@@ -1003,11 +1003,16 @@ int main(int argc, char **argv) { + gstapp->exec (); + + XLockDisplay(display); +- XClientMessageEvent ev = { +- ClientMessage, 0, true, display, wid, +- XInternAtom (display, "XVIDEO", false), 8, {b: "quit_now"} +- }; +- XSendEvent (display, wid, false, StructureNotifyMask, (XEvent *) & ev); ++ XEvent ev; ++ ev.xclient.type = ClientMessage; ++ ev.xclient.serial = 0; ++ ev.xclient.send_event = true; ++ ev.xclient.display = display; ++ ev.xclient.window = wid; ++ ev.xclient.message_type = XInternAtom (display, "XVIDEO", false); ++ ev.xclient.format = 8; ++ strcpy(ev.xclient.data.b, "quit_now"); ++ XSendEvent (display, wid, false, StructureNotifyMask, &ev); + XFlush (display); + XUnlockDisplay(display); + eventThread->wait (500); +diff --git a/src/kmplayerapp.cpp b/src/kmplayerapp.cpp +index 27b26cd..bdeac91 100644 +--- a/src/kmplayerapp.cpp ++++ b/src/kmplayerapp.cpp +@@ -17,6 +17,8 @@ + + #undef Always + ++#include <unistd.h> ++ + // include files for QT + #include <tqdatastream.h> + #include <tqregexp.h> diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13-ftbfs.patch b/redhat/applications/kmplayer/kmplayer-3.5.13-ftbfs.patch index 6b606e32b..f3a5d51da 100644 --- a/redhat/applications/kmplayer/kmplayer-3.5.13-ftbfs.patch +++ b/redhat/applications/kmplayer/kmplayer-3.5.13-ftbfs.patch @@ -4,7 +4,7 @@ kgstplayer_SOURCES= gstplayer.cpp knpplayer_LDADD= $(LIBNSPR_LIBS) -+knpplayer_LDFLAGS= -lX11 ++knpplayer_LDFLAGS= -lX11 -lgmodule-2.0 knpplayer_SOURCES= npplayer.c xdg_apps_DATA = kmplayer.desktop diff --git a/redhat/applications/kmplayer/trinity-kmplayer.spec b/redhat/applications/kmplayer/trinity-kmplayer.spec index 9b938fc7e..933e47ee2 100644 --- a/redhat/applications/kmplayer/trinity-kmplayer.spec +++ b/redhat/applications/kmplayer/trinity-kmplayer.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kmplayer %define version 0.10.0c -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -34,6 +34,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz Patch0: kmplayer-3.5.13-ftbfs.patch +# [kmplayer] Fix compilation with GCC 4.7 [Commit #5106117b] +Patch1: kmplayer-3.5.13-fix_gcc47_compilation.patch + BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-kdebase-devel @@ -96,18 +99,20 @@ Documention for KMPlayer, a basic audio/video viewer application for KDE. unset QTDIR; . /etc/profile.d/qt.sh %setup -q -n applications/%{kdecomp} %patch0 -p1 +%patch1 -p1 # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "admin/acinclude.m4.in" \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" + %build export PATH="%{_bindir}:${PATH}" export LDFLAGS="-L%{_libdir} -I%{_includedir}" @@ -150,7 +155,7 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %files -f %{kdecomp}.lang %defattr(-,root,root,-) -%doc README TODO +%doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm %{_bindir}/kmplayer %{_bindir}/knpplayer %{_bindir}/kxvplayer @@ -193,6 +198,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-2 +- Fix compilation with GCC 4.7 [Commit #5106117b] + * Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-fix_gcc47_compilation.patch new file mode 100644 index 000000000..4daf67e9b --- /dev/null +++ b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-fix_gcc47_compilation.patch @@ -0,0 +1,39 @@ +--- ./kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp.orig 2012-05-02 04:58:04.051212974 -0400 ++++ ./kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp 2012-05-02 05:07:11.093803088 -0400 +@@ -305,14 +305,15 @@ + if ( m_zone && ! m_host ) { + if ( onOff ) { + m_protocolUsage = 0; +- if ( KMFProtocolUsage* pro = m_zone->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) { ++ KMFProtocolUsage* pro; ++ if ( pro = m_zone->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) { + m_protocolUsage = pro; + } else { + KMFUndoEngine::instance()->startTransaction( + m_zone, + i18n("Add protocol %1 to zone %2.").tqarg( protUsage->protocol()->name() ).tqarg( m_zone->guiName() ) + ); +- KMFProtocolUsage * pro = m_zone->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol()->getDOMTree() ); ++ pro = m_zone->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol()->getDOMTree() ); + + if ( pro ) { + kdDebug() << "Added Protocol to zone: " << m_zone-> name() << endl; +@@ -341,15 +342,16 @@ + } else if ( m_host ) { + if ( onOff ) { + m_protocolUsage = 0; ++ KMFProtocolUsage* pro; + +- if ( KMFProtocolUsage* pro = m_host->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) { ++ if ( pro = m_host->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) { + m_protocolUsage = pro; + } else { + KMFUndoEngine::instance()->startTransaction( + m_host, + i18n("Add protocol %1 to host %2.").tqarg( protUsage->protocol()->name() ).tqarg( m_host->guiName() ) + ); +- KMFProtocolUsage * pro = m_host->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol() ->getDOMTree() ); ++ pro = m_host->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol() ->getDOMTree() ); + + if ( pro ) { + kdDebug() << "Added Protocol to host: " << m_host-> name() << endl; diff --git a/redhat/applications/kmyfirewall/trinity-kmyfirewall.spec b/redhat/applications/kmyfirewall/trinity-kmyfirewall.spec index 54befc39d..ddc21d3fa 100644 --- a/redhat/applications/kmyfirewall/trinity-kmyfirewall.spec +++ b/redhat/applications/kmyfirewall/trinity-kmyfirewall.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kmyfirewall %define version 1.1.1 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -33,6 +33,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz +# [kmyfirewall] GCC 4.7 fixes. [Commit #88d2d2a7] +Patch1: kmyfirewall-3.5.13-fix_gcc47_compilation.patch BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel @@ -64,15 +66,16 @@ Requires: %{name} = %{version}-%{release} %prep unset QTDIR; . /etc/profile.d/qt.sh %setup -q -n applications/%{kdecomp} +%patch1 -p1 # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -98,13 +101,17 @@ export PATH="%{_bindir}:${PATH}" %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in hicolor Locolor; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done /sbin/ldconfig || : %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in hicolor Locolor; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done /sbin/ldconfig || : @@ -158,7 +165,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{tde_docdir}/HTML/en/kmyfirewall/common %{tde_docdir}/HTML/en/kmyfirewall/index.cache.bz2 %{tde_docdir}/HTML/en/kmyfirewall/index.docbook -%{_datadir}/icons/*/*/apps/kmyfirewall.png +%{_datadir}/icons/hicolor/*/apps/kmyfirewall.png +%{_datadir}/icons/Locolor/*/apps/kmyfirewall.png %{_datadir}/mimelnk/application/kmfgrs.desktop %{_datadir}/mimelnk/application/kmfnet.desktop %{_datadir}/mimelnk/application/kmfpkg.desktop @@ -174,6 +182,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_libdir}/libkmfwidgets.so %Changelog -* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1 +* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.1.1-2 +- GCC 4.7 fixes. [Commit #88d2d2a7] + +* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.1.1-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/kmymoney/kmymoney-3.5.13-fix_gcc47_compilation.patch new file mode 100644 index 000000000..f9c6cb62e --- /dev/null +++ b/redhat/applications/kmymoney/kmymoney-3.5.13-fix_gcc47_compilation.patch @@ -0,0 +1,11 @@ +--- kmymoney/kmymoney2/plugins/ofximport/ofxpartner.cpp.ORI 2012-05-02 05:22:43.788349181 -0400 ++++ kmymoney/kmymoney2/plugins/ofximport/ofxpartner.cpp 2012-05-02 05:23:01.910909490 -0400 +@@ -20,6 +20,8 @@ + #include <config.h> + #endif + ++#include <unistd.h> ++ + // ---------------------------------------------------------------------------- + // QT Includes + diff --git a/redhat/applications/kmymoney/trinity-kmymoney-3.5.13.spec b/redhat/applications/kmymoney/trinity-kmymoney-3.5.13.spec index c0af9baf6..f1a9dea58 100644 --- a/redhat/applications/kmymoney/trinity-kmymoney-3.5.13.spec +++ b/redhat/applications/kmymoney/trinity-kmymoney-3.5.13.spec @@ -1,12 +1,13 @@ # Default version for this component %define kdecomp kmymoney %define version 1.0.5 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc +%define _docdir %{_datadir}/doc +%define _mandir %{_datadir}/man %endif # TDE 3.5.13 specific building variables @@ -36,12 +37,15 @@ Source0: %{kdecomp}-3.5.13.tar.gz Source1: kmymoneytitlelabel.png Patch0: kmymoney-3.5.13-recode_ftbfs.patch -## TDE Commit: 2a54aa58cfe166f48d6f1395cbc6c9bfd5e31bfc +# TDE Commit: 2a54aa58cfe166f48d6f1395cbc6c9bfd5e31bfc Patch1: kmymoney-3.5.13-lots_of_crash.patch -## TDE Commit: 8654cea10f6902719006d5975db7dc07b2fcc713 +# TDE Commit: 8654cea10f6902719006d5975db7dc07b2fcc713 Patch2: kmymoney-3.5.13-update_to_1.0.5.patch +# [kmymoney] Fix compilation with GCC 4.7 [Bug #958] +Patch3: kmymoney-3.5.13-fix_gcc47_compilation.patch + BuildRequires: tqtinterface-devel BuildRequires: trinity-arts-devel BuildRequires: trinity-kdelibs-devel @@ -87,16 +91,17 @@ This package contains development files needed for KMyMoney plugins. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %__install -m644 %{SOURCE1} kmymoney2/widgets/ # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -142,19 +147,25 @@ if [ -d %{buildroot}$HTML_DIR ]; then done fi +%find_lang kmymoney2 + %clean %__rm -rf %{buildroot} %post /sbin/ldconfig -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in hicolor locolor Tango oxygen; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done %postun /sbin/ldconfig -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in hicolor locolor Tango oxygen; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done %files %defattr(-,root,root,-) @@ -168,7 +179,7 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{tde_libdir}/kmm_ofximport.la %{tde_libdir}/kmm_ofximport.so -%files common +%files common -f kmymoney2.lang %defattr(-,root,root,-) %{_datadir}/apps/kmymoney2/html/ %{_datadir}/apps/kmymoney2/icons/*/*/*/*.png @@ -178,9 +189,12 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_datadir}/apps/kmymoney2/templates/*/*.kmt %{_datadir}/apps/kmymoney2/tips %{_datadir}/config.kcfg/kmymoney2.kcfg -%{_datadir}/icons/*/*/*/*.png -%{_datadir}/icons/*/*/*.svgz -%{_datadir}/locale/*/LC_MESSAGES/*.mo +%{_datadir}/icons/hicolor/*/*/*.png +%{_datadir}/icons/Tango/*/*/*.png +%{_datadir}/icons/Tango/scalable/*.svgz +%{_datadir}/icons/locolor/*/*/*.png +%{_datadir}/icons/oxygen/*/*/*.png +%{_datadir}/icons/oxygen/scalable/*.svgz %{tde_docdir}/HTML/en/kmymoney2/*.docbook %{tde_docdir}/HTML/en/kmymoney2/*.png %{tde_docdir}/HTML/en/kmymoney2/common @@ -201,6 +215,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_usr}/%{_lib}/qt-3.3/plugins/designer/libkmymoney.so %Changelog +* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-2 +- Rebuild for Fedora 17 +- Fix compilation with GCC 4.7 [Bug #958] + * Sun Jan 15 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1 - Updates to upstream 1.0.5 diff --git a/redhat/applications/knemo/trinity-knemo.spec b/redhat/applications/knemo/trinity-knemo.spec index 4a26e682b..441a78732 100644 --- a/redhat/applications/knemo/trinity-knemo.spec +++ b/redhat/applications/knemo/trinity-knemo.spec @@ -1,12 +1,12 @@ # Default version for this component %define kdecomp knemo %define version 0.4.8 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc +%define _docdir %{_datadir}/doc %endif # TDE 3.5.13 specific building variables @@ -59,11 +59,11 @@ Homepage: http://extragear.kde.org/apps/knemo/ # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -88,12 +88,12 @@ export PATH="%{_bindir}:${PATH}" %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/crystalsvg || : +gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/crystalsvg || : +gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : %files @@ -111,5 +111,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.8-2 +- Rebuild for Fedora 17 + * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.8-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/knetload/trinity-knetload.spec b/redhat/applications/knetload/trinity-knetload.spec index 1e90086c7..55b1383c2 100644 --- a/redhat/applications/knetload/trinity-knetload.spec +++ b/redhat/applications/knetload/trinity-knetload.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp knetload %define version 2.3 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -56,11 +56,11 @@ KNetLoad can monitor just about any network device. # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -90,12 +90,16 @@ export PATH="%{_bindir}:${PATH}" %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in crystalsvg locolor ; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in crystalsvg locolor ; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done %files -f %{kdecomp}.lang @@ -103,9 +107,13 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_bindir}/knetload %{_datadir}/applications/kde/knetload.desktop %{_datadir}/apps/knetload -%{_datadir}/icons/*/*/apps/knetload.png +%{_datadir}/icons/crystalsvg/*/apps/knetload.png +%{_datadir}/icons/locolor/*/apps/knetload.png %Changelog +* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 2.3-2 +- Rebuild for Fedora 17 + * Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.3-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/knetstats/trinity-knetstats.spec b/redhat/applications/knetstats/trinity-knetstats.spec index f27ddeeda..0179cdd61 100644 --- a/redhat/applications/knetstats/trinity-knetstats.spec +++ b/redhat/applications/knetstats/trinity-knetstats.spec @@ -51,11 +51,11 @@ network interface on a system tray icon # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" diff --git a/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec b/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec index 1c45101ff..3dbcc7458 100644 --- a/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec +++ b/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec @@ -5,7 +5,7 @@ %else %define version 0.8 %endif -%define release 2 +%define release 3 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -130,7 +130,7 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_sysconfdir}/dbus-1/system.d/knetworkmanager.conf %{_datadir}/applications/kde/knetworkmanager.desktop %{_datadir}/apps/knetworkmanager -%{_datadir}/icons/*/*/apps/knetworkmanager* +%{_datadir}/icons/hicolor/*/apps/knetworkmanager* %{_datadir}/servicetypes/knetworkmanager_plugin.desktop %{_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop @@ -142,6 +142,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{tde_libdir}/*.so %changelog +* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-3 / 0.9-3 +- Rebuild for Fedora 17 + * Sat Nov 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-2 / 0.9-2 - Remove faulty patch for WPA authentication diff --git a/redhat/applications/knights/trinity-knights.spec b/redhat/applications/knights/trinity-knights.spec index f1b53b788..6338661d7 100644 --- a/redhat/applications/knights/trinity-knights.spec +++ b/redhat/applications/knights/trinity-knights.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp knights %define version 0.6 -%define release 2 +%define release 3 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -62,11 +62,11 @@ Here's a quick list of Knights' key features: # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -107,11 +107,14 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_datadir}/applnk/Games/Board/knights.desktop %{_datadir}/apps/knights %{tde_docdir}/HTML/*/knights -%{_datadir}/icons/*/*/*/*.png +%{_datadir}/icons/hicolor/*/*/*.png %{_datadir}/mimelnk/application/pgn.desktop %Changelog +* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.6-3 +- Rebuild for Fedora 17 + * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.6-2 - Fix HTML directory location diff --git a/redhat/applications/knowit/trinity-knowit.spec b/redhat/applications/knowit/trinity-knowit.spec index 17a235f7e..4b40fe29f 100644 --- a/redhat/applications/knowit/trinity-knowit.spec +++ b/redhat/applications/knowit/trinity-knowit.spec @@ -52,11 +52,11 @@ but KDE-based, and requires Trinity. # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" diff --git a/redhat/applications/knutclient/trinity-knutclient.spec b/redhat/applications/knutclient/trinity-knutclient.spec index be92e93df..ef45ad28d 100644 --- a/redhat/applications/knutclient/trinity-knutclient.spec +++ b/redhat/applications/knutclient/trinity-knutclient.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp knutclient %define version 0.9.5 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -53,12 +53,12 @@ unset QTDIR; . /etc/profile.d/qt.sh # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "admin/acinclude.m4.in" \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -86,12 +86,16 @@ export PATH="%{_bindir}:${PATH}" %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in hicolor locolor; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in hicolor locolor; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done %files -f %{kdecomp}.lang @@ -103,10 +107,13 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_datadir}/apps/knutclient %{tde_docdir}/HTML/cs/knutclient %{tde_docdir}/HTML/en/knutclient -%{_datadir}/icons/*/*/apps/*.png - +%{_datadir}/icons/hicolor/*/apps/*.png +%{_datadir}/icons/locolor/*/apps/*.png %Changelog +* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.5-2 +- Rebuild for Fedora 17 + * Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.5-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/koffice/koffice-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/koffice/koffice-3.5.13-fix_gcc47_compilation.patch index d632a9d79..909107727 100644 --- a/redhat/applications/koffice/koffice-3.5.13-fix_gcc47_compilation.patch +++ b/redhat/applications/koffice/koffice-3.5.13-fix_gcc47_compilation.patch @@ -17,40 +17,3 @@ } ~Iterator() ---- koffice/filters/chalk/png/kis_png_converter.cc.gcc47 2012-04-26 16:38:35.805156927 -0400 -+++ koffice/filters/chalk/png/kis_png_converter.cc 2012-04-26 16:49:27.179323394 -0400 -@@ -43,6 +43,8 @@ - #include <kis_paint_layer.h> - #include <kis_group_layer.h> - -+#include <zlib.h> -+ - namespace { - - const TQ_UINT8 PIXEL_BLUE = 0; -@@ -222,6 +224,7 @@ - - // Read image profile - png_charp profile_name, profile_data; -+ unsigned char* uprofile_data = reinterpret_cast<unsigned char*>(profile_data); - int compression_type; - png_uint_32 proflen; - int number_of_passes = 1; -@@ -230,7 +233,7 @@ - number_of_passes = png_set_interlace_handling(png_ptr); - - KisProfile* profile = 0; -- if(png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &profile_data, &proflen)) -+ if(png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &uprofile_data, &proflen)) - { - TQByteArray profile_rawdata; - // XXX: Hardcoded for icc type -- is that correct for us? -@@ -627,7 +630,7 @@ - } else { // Profile - char* name = new char[(*it)->type().length()+1]; - strcpy(name, (*it)->type().ascii()); -- png_set_iCCP(png_ptr, info_ptr, name, PNG_COMPRESSION_TYPE_BASE, (char*)(*it)->annotation().data(), (*it) -> annotation() . size()); -+ png_set_iCCP(png_ptr, info_ptr, name, PNG_COMPRESSION_TYPE_BASE, (unsigned char*)(*it)->annotation().data(), (*it) -> annotation() . size()); - } - ++it; - } diff --git a/redhat/applications/koffice/koffice-3.5.13-fix_libpng.patch b/redhat/applications/koffice/koffice-3.5.13-fix_libpng.patch index cba4b2584..004bb0225 100644 --- a/redhat/applications/koffice/koffice-3.5.13-fix_libpng.patch +++ b/redhat/applications/koffice/koffice-3.5.13-fix_libpng.patch @@ -1,5 +1,5 @@ ---- /dev/shm/applications/koffice/filters/chalk/png/kis_png_converter.cc 2011-06-27 13:54:18.000000000 -0500 -+++ /dev/shm/applications/koffice/filters/chalk/png/kis_png_converter.cc.new 2011-11-07 15:38:47.918508855 -0600 +--- koffice/filters/chalk/png/kis_png_converter.cc 2011-06-27 13:54:18.000000000 -0500 ++++ koffice/filters/chalk/png/kis_png_converter.cc.new 2011-11-07 15:38:47.918508855 -0600 @@ -785,7 +785,7 @@ void KisPNGConverter::progress(png_structp png_ptr, png_uint_32 row_number, int pass) @@ -9,3 +9,40 @@ // setProgress(row_number); } +--- koffice/filters/chalk/png/kis_png_converter.cc.gcc47 2012-04-26 16:38:35.805156927 -0400 ++++ koffice/filters/chalk/png/kis_png_converter.cc 2012-04-26 16:49:27.179323394 -0400 +@@ -43,6 +43,8 @@ + #include <kis_paint_layer.h> + #include <kis_group_layer.h> + ++#include <zlib.h> ++ + namespace { + + const TQ_UINT8 PIXEL_BLUE = 0; +@@ -222,6 +224,7 @@ + + // Read image profile + png_charp profile_name, profile_data; ++ unsigned char* uprofile_data = reinterpret_cast<unsigned char*>(profile_data); + int compression_type; + png_uint_32 proflen; + int number_of_passes = 1; +@@ -230,7 +233,7 @@ + number_of_passes = png_set_interlace_handling(png_ptr); + + KisProfile* profile = 0; +- if(png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &profile_data, &proflen)) ++ if(png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &uprofile_data, &proflen)) + { + TQByteArray profile_rawdata; + // XXX: Hardcoded for icc type -- is that correct for us? +@@ -627,7 +630,7 @@ + } else { // Profile + char* name = new char[(*it)->type().length()+1]; + strcpy(name, (*it)->type().ascii()); +- png_set_iCCP(png_ptr, info_ptr, name, PNG_COMPRESSION_TYPE_BASE, (char*)(*it)->annotation().data(), (*it) -> annotation() . size()); ++ png_set_iCCP(png_ptr, info_ptr, name, PNG_COMPRESSION_TYPE_BASE, (unsigned char*)(*it)->annotation().data(), (*it) -> annotation() . size()); + } + ++it; + } diff --git a/redhat/applications/koffice/trinity-koffice.spec b/redhat/applications/koffice/trinity-koffice.spec index 9f487c4e6..fe3f44328 100644 --- a/redhat/applications/koffice/trinity-koffice.spec +++ b/redhat/applications/koffice/trinity-koffice.spec @@ -92,9 +92,6 @@ BuildRequires: gettext-devel BuildRequires: mysql-devel BuildRequires: desktop-file-utils BuildRequires: perl -BuildRequires: trinity-wv2-devel >= 0.4.0 -#BuildRequires: trinity-libpqxx-devel >= 2.6.0 -BuildRequires: libpqxx-devel BuildRequires: doxygen BuildRequires: aspell-devel BuildRequires: libxslt-devel @@ -108,10 +105,12 @@ BuildRequires: ruby ruby-devel >= 1.8.2 BuildRequires: libpaper-devel BuildRequires: libXi-devel BuildRequires: libutempter-devel -BuildRequires: poppler-qt-devel >= 0.1.2 BuildRequires: GraphicsMagick-devel >= 1.1.0 -BuildRequires: trinity-libwpd-devel +BuildRequires: trinity-wv2-devel +BuildRequires: trinity-poppler-qt3-devel >= 0.1.2 +BuildRequires: trinity-libwpd-devel +BuildRequires: trinity-libpqxx-devel %description KOffice is an integrated office suite. @@ -308,8 +307,10 @@ This package is part of the TDE Office Suite. %patch10 -p0 %patch11 -p0 %patch12 -p1 -b .gcc47 -%patch13 -p1 -%patch14 -p5 +%if 0%{?fedora} >= 17 +%patch13 -p1 -b .ruby +%patch14 -p1 -b .libpng +%endif # use LGC variant instead %__sed -i.dejavu-lgc \ @@ -324,7 +325,7 @@ This package is part of the TDE Office Suite. -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -343,6 +344,8 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}" --with-extra-includes=%{_includedir}/tqt \ --enable-closure \ --disable-kexi-macros \ + --with-pqxx-includes=%{_includedir} \ + --with-pqxx-libraries=%{_libdir} \ %if 0%{?with_kross} > 0 --enable-scripting \ %else diff --git a/redhat/applications/kopete-otr/trinity-kopete-otr.spec b/redhat/applications/kopete-otr/trinity-kopete-otr.spec index 390c5c14e..ec87c5a5e 100644 --- a/redhat/applications/kopete-otr/trinity-kopete-otr.spec +++ b/redhat/applications/kopete-otr/trinity-kopete-otr.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kopete-otr %define version 0.7 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -57,11 +57,11 @@ unset QTDIR; . /etc/profile.d/qt.sh # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -87,13 +87,13 @@ export PATH="%{_bindir}:${PATH}" %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/crystalsvg || : +gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : /sbin/ldconfig || : %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/crystalsvg || : +gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : /sbin/ldconfig || : @@ -120,6 +120,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-2 +- Rebuild for Fedora 17 + * Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.7-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kpicosim/trinity-kpicosim.spec b/redhat/applications/kpicosim/trinity-kpicosim.spec index d162b6413..e6fcf0466 100644 --- a/redhat/applications/kpicosim/trinity-kpicosim.spec +++ b/redhat/applications/kpicosim/trinity-kpicosim.spec @@ -6,7 +6,7 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc +%define _docdir %{_datadir}/doc %endif # TDE 3.5.13 specific building variables @@ -53,11 +53,11 @@ simulator and export functions to VHDL, HEX and MEM files. # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" diff --git a/redhat/applications/kpilot/trinity-kpilot.spec b/redhat/applications/kpilot/trinity-kpilot.spec index 19e13e95f..ad078e091 100644 --- a/redhat/applications/kpilot/trinity-kpilot.spec +++ b/redhat/applications/kpilot/trinity-kpilot.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kpilot %define version 0.7 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -59,11 +59,11 @@ and synchronize the built-in applications with their KDE counterparts. # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -94,13 +94,17 @@ export PATH="%{_bindir}:${PATH}" %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in hicolor locolor crystalsvg; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done /sbin/ldconfig || : %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in hicolor locolor crystalsvg; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done /sbin/ldconfig || : @@ -144,11 +148,16 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_datadir}/apps/kconf_update/kpilot.upd %{_datadir}/apps/kpilot %{_datadir}/config.kcfg/*.kcfg -%{_datadir}/icons/*/*/apps/*.png +%{_datadir}/icons/crystalsvg/*/apps/*.png +%{_datadir}/icons/hicolor/*/apps/*.png +%{_datadir}/icons/locolor/*/apps/*.png %{_datadir}/services/*.desktop %{_datadir}/servicetypes/kpilotconduit.desktop %Changelog +* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-2 +- Rebuild for Fedora 17 + * Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.7-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kpowersave/trinity-kpowersave.spec b/redhat/applications/kpowersave/trinity-kpowersave.spec index 7ae8ec505..427d621c8 100644 --- a/redhat/applications/kpowersave/trinity-kpowersave.spec +++ b/redhat/applications/kpowersave/trinity-kpowersave.spec @@ -6,7 +6,7 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc +%define _docdir %{_datadir}/doc %endif # TDE 3.5.13 specific building variables @@ -117,7 +117,7 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_datadir}/applications/kde/kpowersave.desktop %{_datadir}/apps/kpowersave/eventsrc %{_datadir}/apps/kpowersave/icons/*/*/*/*.png -%{_datadir}/icons/*/*/*/*.png +%{_datadir}/icons/hicolor/*/*/*.png %{_datadir}/autostart/kpowersave-autostart.desktop %{_datadir}/config/kpowersaverc diff --git a/redhat/applications/kradio/trinity-kradio.spec b/redhat/applications/kradio/trinity-kradio.spec index 505dca071..f91bbe932 100644 --- a/redhat/applications/kradio/trinity-kradio.spec +++ b/redhat/applications/kradio/trinity-kradio.spec @@ -1,12 +1,12 @@ # Default version for this component %define kdecomp kradio %define version 0.1.1.1 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc +%define _docdir %{_datadir}/doc %endif # TDE 3.5.13 specific building variables @@ -67,11 +67,12 @@ of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome. # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -98,12 +99,16 @@ export PATH="%{_bindir}:${PATH}" %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in hicolor locolor ; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in hicolor locolor ; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done %files -f %{kdecomp}.lang @@ -113,12 +118,17 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_libdir}/kradio/plugins/*.la %{_libdir}/kradio/plugins/*.so %{_datadir}/applications/kde/kradio.desktop -%{_datadir}/apps/kradio/icons/*/*/*/*.png +%{_datadir}/apps/kradio/icons/hicolor/*/*/*.png +%{_datadir}/apps/kradio/icons/locolor/*/*/*.png %{_datadir}/apps/kradio/presets/*/*.krp %{_datadir}/apps/kradio/presets/*/*/*.krp %{_datadir}/locale/*/LC_MESSAGES/kradio-*.mo %Changelog +* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-2 +- Rebuild for Fedora 17 +- Fix HTML directory location + * Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/krename/trinity-krename-3.5.13.spec b/redhat/applications/krename/trinity-krename-3.5.13.spec index 9c813486c..1b0a6929e 100644 --- a/redhat/applications/krename/trinity-krename-3.5.13.spec +++ b/redhat/applications/krename/trinity-krename-3.5.13.spec @@ -1,15 +1,15 @@ # Default version for this component %define kdecomp krename %define version 3.0.14 -%define release 3 +%define release 4 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc +%define _docdir %{_datadir}/doc %endif -# TDE 3.5.12 specific building variables +# TDE 3.5.13 specific building variables BuildRequires: autoconf automake libtool m4 %define tde_docdir %{_docdir}/kde %define tde_includedir %{_includedir}/kde @@ -17,7 +17,7 @@ BuildRequires: autoconf automake libtool m4 Name: trinity-%{kdecomp} -Summary: A KDE batch file renaming utility. +Summary: A TDE batch file renaming utility. Version: %{?version} Release: %{?release}%{?dist}%{?_variant} @@ -40,7 +40,7 @@ BuildRequires: desktop-file-utils BuildRequires: imlib-devel %description -KRename is a powerful batch renamer for KDE 3.x. It allows you to easily rename hundreds or +KRename is a powerful batch renamer for TDE. It allows you to easily rename hundreds or even more files in one go. The filenames can be created by parts of the original filename, numbering the files or accessing hundreds of informations about the file, like creation date or Exif informations of an image. @@ -50,11 +50,12 @@ or Exif informations of an image. # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -75,32 +76,42 @@ export PATH="%{_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} +%find_lang %{kdecomp} + %clean %__rm -rf %{buildroot} %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in hicolor locolor ; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in hicolor locolor ; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done -%files +%files -f %{kdecomp}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING %{_bindir}/* %{_datadir}/applications/*/*.desktop %{_datadir}/apps/*/ -%{_docdir}/HTML/en/*/ -%{_datadir}/icons/*/*/*/* -%{_datadir}/locale/*/*/*.mo +%{tde_docdir}/HTML/en/*/ +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/icons/locolor/*/*/* %Changelog +* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.0.14-4 +- Rebuild for Fedora 17 +- Fix HTML directory location + * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-3 - Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/krusader/krusader-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/krusader/krusader-3.5.13-fix_gcc47_compilation.patch new file mode 100644 index 000000000..cc1e71ff0 --- /dev/null +++ b/redhat/applications/krusader/krusader-3.5.13-fix_gcc47_compilation.patch @@ -0,0 +1,20 @@ +commit fdf6d34084255fa4e17833f8ef93626e5dd926e6 +Author: Darrell Anderson <humanreadable@yahoo.com> +Date: 1335632256 -0500 + + GCC 4.7 fixes. + +diff --git a/krusader/UserAction/tstring.h b/krusader/UserAction/tstring.h +index 94ece59..9356e5c 100644 +--- a/krusader/UserAction/tstring.h ++++ b/krusader/UserAction/tstring.h +@@ -14,6 +14,9 @@ + #include <tqvaluelist.h> + #include <utility> + #include <cassert> ++ ++using namespace std; ++ + template <class T> + class TagString_t + { diff --git a/redhat/applications/krusader/trinity-krusader.spec b/redhat/applications/krusader/trinity-krusader.spec index eeb31a155..2816e930f 100644 --- a/redhat/applications/krusader/trinity-krusader.spec +++ b/redhat/applications/krusader/trinity-krusader.spec @@ -1,13 +1,13 @@ # Default version for this component %define kdecomp krusader %define version 1.90.0 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc -%define _mandir %{_prefix}/share/man +%define _docdir %{_datadir}/doc +%define _mandir %{_datadir}/man %endif # TDE 3.5.13 specific building variables @@ -34,6 +34,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz +# [krusader] GCC 4.7 fixes. [Commit #fdf6d340] +Patch1: krusader-3.5.13-fix_gcc47_compilation.patch BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel @@ -44,7 +46,7 @@ BuildRequires: trinity-kdebindings-devel %description Krusader is a simple, easy, powerful, twin-panel (commander-style) file -manager for KDE and other desktops, similar to Midnight Commander (C) or Total +manager for TDE and other desktops, similar to Midnight Commander (C) or Total Commander (C). It provides all the file management features you could possibly want. @@ -64,15 +66,16 @@ great on your desktop. %prep %setup -q -n applications/%{kdecomp} +%patch1 -p1 # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -99,14 +102,16 @@ export PATH="%{_bindir}:${PATH}" %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -/sbin/ldconfig || : +for f in crystalsvg locolor ; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -/sbin/ldconfig || : +for f in crystalsvg locolor ; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done %files -f %{kdecomp}.lang @@ -122,13 +127,18 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_datadir}/apps/krusader %{tde_docdir}/HTML/en/krusader %{tde_docdir}/HTML/ru/krusader -%{_datadir}/icons/*/*/apps/*.png +%{_datadir}/icons/crystalsvg/*/apps/*.png +%{_datadir}/icons/locolor/*/apps/*.png %{_datadir}/services/krarc.protocol %{_datadir}/services/virt.protocol %{_mandir}/man1/krusader.1 %Changelog +* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.90.0-2 +- Rebuild for Fedora 17 +- GCC 4.7 fixes. [Commit #fdf6d340] + * Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.90.0-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/ksplash-engine-moodin/trinity-ksplash-engine-moodin.spec b/redhat/applications/ksplash-engine-moodin/trinity-ksplash-engine-moodin.spec index 8f1b80b1a..5fc9e7c07 100644 --- a/redhat/applications/ksplash-engine-moodin/trinity-ksplash-engine-moodin.spec +++ b/redhat/applications/ksplash-engine-moodin/trinity-ksplash-engine-moodin.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp ksplash-engine-moodin %define version 0.4.2 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -52,7 +52,7 @@ Features: * custom image arrangement * resolution independent themes -This KDE splash screen engine is based upon Linspire's +This TDE splash screen engine is based upon Linspire's engine by Sean Meiners <Sean.Meiners@LinspireInc.com> Homepage: http://moodwrod.com @@ -63,11 +63,12 @@ Homepage: http://moodwrod.com # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -92,15 +93,6 @@ export PATH="%{_bindir}:${PATH}" %__rm -rf %{buildroot} -%post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - -%postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - - %files %defattr(-,root,root,-) %{tde_libdir}/ksplashmoodin.la @@ -110,5 +102,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.2-2 +- Rebuild for Fedora 17 +- Removes post and postun + * Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.2-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/ksquirrel/trinity-ksquirrel.spec b/redhat/applications/ksquirrel/trinity-ksquirrel.spec index d837fc52e..945628cfb 100644 --- a/redhat/applications/ksquirrel/trinity-ksquirrel.spec +++ b/redhat/applications/ksquirrel/trinity-ksquirrel.spec @@ -1,12 +1,13 @@ # Default version for this component %define kdecomp ksquirrel %define version 0.8.0 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc +%define _docdir %{_datadir}/doc +%define _mandir %{_datadir}/man %endif # TDE 3.5.13 specific building variables @@ -44,7 +45,7 @@ BuildRequires: trinity-libksquirrel-devel #BuildRequires: libkexif-devel %description -KSquirrel is an image viewer for KDE with disk navigator, file tree, +KSquirrel is an image viewer for TDE with disk navigator, file tree, multiple directory view, thumbnails, extended thumbnails, dynamic format support, DCOP interface, KEXIF and KIPI plugins support. @@ -57,11 +58,12 @@ OpenGL and dynamic format support. # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -112,13 +114,17 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_datadir}/config/magic/x-ras.magic %{_datadir}/config/magic/x-sun.magic %{_datadir}/config/magic/x-utah.magic -%{_docdir}/HTML/*/ksquirrel +%{tde_docdir}/HTML/*/ksquirrel %{_datadir}/icons/hicolor/*/apps/ksquirrel.png %{_datadir}/mimelnk/image/*.desktop %{_datadir}/services/ksquirrelpart.desktop %{_datadir}/locale/*/LC_MESSAGES/ksquirrel.mo -%{_mandir}/man1/ksquirrel.1.gz +%{_mandir}/man1/ksquirrel.1 %Changelog +* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.1-2 +- Rebuild for Fedora 17 +- Fix HTML directory location + * Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.0-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kstreamripper/trinity-kstreamripper-3.5.13.spec b/redhat/applications/kstreamripper/trinity-kstreamripper-3.5.13.spec index 94855fdcf..5860200ab 100644 --- a/redhat/applications/kstreamripper/trinity-kstreamripper-3.5.13.spec +++ b/redhat/applications/kstreamripper/trinity-kstreamripper-3.5.13.spec @@ -94,15 +94,6 @@ fi %__rm -rf %{buildroot} -%post -/sbin/ldconfig -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - -%postun -/sbin/ldconfig -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %files %defattr(-,root,root,-) diff --git a/redhat/applications/ksystemlog/trinity-ksystemlog.spec b/redhat/applications/ksystemlog/trinity-ksystemlog.spec index cf7249b88..8c2e00269 100644 --- a/redhat/applications/ksystemlog/trinity-ksystemlog.spec +++ b/redhat/applications/ksystemlog/trinity-ksystemlog.spec @@ -55,12 +55,12 @@ unset QTDIR; . /etc/profile.d/qt.sh # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "admin/acinclude.m4.in" \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" diff --git a/redhat/applications/kvpnc/trinity-kvpnc.spec b/redhat/applications/kvpnc/trinity-kvpnc.spec new file mode 100644 index 000000000..930dcf410 --- /dev/null +++ b/redhat/applications/kvpnc/trinity-kvpnc.spec @@ -0,0 +1,113 @@ +# Default version for this component +%define kdecomp kvpnc +%define version 0.9.6a +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: vpn clients frontend for TDE +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-master.tar.gz +Source1: admin-master.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils + +%description +KVpnc is a TDE frontend for various vpn clients. + +It supports : + * Cisco-compatible VPN client (vpnc) + * IPSec (freeswan, openswan, racoon) + * Point-to-Point Tunneling Protocol (PPTP) client (pptp-linux) + * Virtual Private Network daemon (openvpn) + + +%prep +unset QTDIR; . /etc/profile.d/qt.sh +%setup -q -n %{kdecomp}-master + +# 'admin' folder from GIT +%setup -q -n %{kdecomp}-master -a 1 +%__rm -rf admin +%__mv -f admin-master admin + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +%__sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt \ + --enable-closure + +%__make %{?_smp_mflags} + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +/sbin/ldconfig || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +/sbin/ldconfig || : + + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING README TODO + + + +%Changelog +* Sat Dec 10 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.6a-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 + diff --git a/redhat/components-3.5.13.txt b/redhat/components-3.5.13.txt new file mode 100644 index 000000000..688f2ad24 --- /dev/null +++ b/redhat/components-3.5.13.txt @@ -0,0 +1,120 @@ +dependencies/qt3 +dependencies/tqtinterface +dependencies/arts +dependencies/dbus-tqt +dependencies/dbus-1-tqt +dependencies/libcaldav +dependencies/libcarddav +kdelibs +kdebase +kdebindings +kdeaccessibility +kdeutils +kdemultimedia +kdenetwork +kdeadmin +kdeartwork +kdegames +kdetoys +kdeedu +kdegraphics +kdeaddons +kdepim +kdesdk +kdevelop +kdewebdev +kde-i18n +libraries/libkdcraw +libraries/libkexiv2 +libraries/libkipi +libraries/libksquirrel +libraries/python-trinity +libraries/pykdeextensions +extras/akode +extras/kasablanca +extras/ksensors +extras/libkarma +extras/kdebluetooth +extras/trinity-desktop +extras/trinity-live +applications/k3b +applications/abakus +applications/dolphin +applications/gwenview +applications/krename +applications/yakuake +#applications/desktop-effects-kde +applications/filelight +applications/filelight-l10n +applications/kdiff3 +#applications/kuickshow +applications/basket +applications/katapult +#applications/compizconfig-backend-kconfig +applications/kbookreader +applications/kdbusnotification +applications/kmymoney +applications/kstreamripper +applications/kdesudo +applications/digikam +applications/konversation +applications/amarok +applications/kaffeine +applications/knetworkmanager +applications/kwin-style-crystal +applications/kde-style-lipstik +applications/kde-style-qtcurve +applications/kpowersave +applications/kiosktool +applications/k9copy +applications/kchmviewer +applications/kbfx +applications/kradio +applications/kcpuload +applications/fusion-icon +applications/ksplash-engine-moodin +applications/knights +applications/ksquirrel +applications/gtk-qt-engine +applications/koffice +applications/ktechlab +applications/piklab +applications/keep +applications/tellico +applications/kile +applications/kdmtheme +applications/knemo +applications/kerry +applications/kvirc +applications/rosegarden +applications/wlassistant +applications/ktorrent +applications/bibletime +applications/smb4k +applications/knetload +applications/knetstats +applications/knowit +applications/kpilot +applications/kdirstat +applications/kbarcode +applications/kpicosim +applications/kgtk-qt3 +applications/kima +applications/kdesvn +applications/kde-guidance +applications/krusader +applications/smartcardauth +applications/kmyfirewall +applications/kopete-otr +applications/kaffeine-mozilla +applications/ksystemlog +applications/kio-locate +#applications/konstruct +applications/kio-umountwrapper +applications/knutclient +applications/kde-systemsettings +applications/kmplayer +applications/kvkbd +applications/potracegui +applications/soundkonverter + diff --git a/redhat/components.txt b/redhat/components.txt index 3029678b4..4fc08a9b6 100644 --- a/redhat/components.txt +++ b/redhat/components.txt @@ -23,11 +23,11 @@ kdegames kdetoys kdeedu kdegraphics -kdevelop kdeaddons -kdewebdev kdepim kdesdk +kdevelop +kdewebdev kde-i18n libraries/libkdcraw libraries/libkexiv2 diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec index 670a6f9d5..556479efc 100644 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec +++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 2 +%define release 3 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -11,8 +11,8 @@ # TDE 3.5.13 specific building variables BuildRequires: cmake >= 2.8 -BuildRequires: qt3-devel >= 3.3.8d -Requires: qt3 >= 3.3.8d +BuildRequires: qt3-devel >= 3.3.8.d +Requires: qt3 >= 3.3.8.d Name: dbus-tqt @@ -81,6 +81,9 @@ cd build %{_libdir}/pkgconfig/*.pc %changelog +* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 +- Updates BuildRequires + * Tue Nov 07 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2 - Updates BuildRequires diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13-add_missing_endianness_defines.patch b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13-add_missing_endianness_defines.patch new file mode 100644 index 000000000..9f4dc4eed --- /dev/null +++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13-add_missing_endianness_defines.patch @@ -0,0 +1,14 @@ +--- tqtinterface/qtinterface/tqt.h.cmake.orig 2011-10-09 02:40:38.000000000 -0400 ++++ tqtinterface/qtinterface/tqt.h.cmake 2012-05-01 15:10:09.220681454 -0400 +@@ -74,6 +74,11 @@ + #define TQS_OK QS_OK + #define TQTSFUNC QTSFUNC + #define TQ_TYPENAME Q_TYPENAME ++ ++#define TQ_BYTE_ORDER Q_BYTE_ORDER ++#define TQ_LITTLE_ENDIAN Q_LITTLE_ENDIAN ++#define TQ_BIG_ENDIAN Q_BIG_ENDIAN ++ + #define TQT_CHECK_INVALID_MAP_ELEMENT QT_CHECK_INVALID_MAP_ELEMENT + + #define TQT_VERSION QT_VERSION diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec index a63e8a814..bbb9a48d7 100755 --- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 2 +%define release 3 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -37,6 +37,8 @@ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}.tar.gz +# [tqtinterface] Add missing endian-ness defines [Bug #727] [Commit #458e74a6] +Patch1: tqtinterface-3.5.13-add_missing_endianness_defines.patch BuildRequires: gcc-c++ BuildRequires: libXi-devel @@ -57,6 +59,7 @@ Development files for %{name} %prep %setup -q -n dependencies/%{name} +%patch1 -p1 %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -110,6 +113,10 @@ done %changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 +- Rebuilt for Fedora 17 +- Add missing endian-ness defines [Bug #727] [Commit #458e74a6] + * Sun Nov 06 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2 - Add missing Requires diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh index 20f8d45ce..57e0ebad6 100755 --- a/redhat/genrpm.sh +++ b/redhat/genrpm.sh @@ -6,7 +6,7 @@ while [ $# -gt 0 ]; do case "$1" in "--auto") AUTO=1;; "--version") REQVERSION="$2"; shift;; - *) COMP="$1";; + *) COMP="${1%%/}";; esac shift done diff --git a/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec index 3650c8332..acf01c9bd 100644 --- a/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec +++ b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec @@ -2,12 +2,12 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 3 +%define release 4 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc +%define _docdir %{_datadir}/doc %endif # TDE 3.5.13 specific building variables @@ -36,8 +36,6 @@ Source0: kdeaddons-%{version}.tar.gz Source1: metabar-fedora.tar.bz2 Source2: metabarrc -Patch3: kdeaddons-3.5.3-sdl.patch - BuildRequires: trinity-kdebase-devel BuildRequires: trinity-kdegames-devel BuildRequires: trinity-kdemultimedia-devel @@ -83,16 +81,14 @@ This package includes: %prep %setup -q -a 1 -n kdeaddons -%patch3 -p1 -b .sdl - # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -247,6 +243,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: %changelog +* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4 +- Removes SDL patch for noatun + * Thu Dec 15 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 - Fix content of -extras package - Fix various packaging issues diff --git a/redhat/kdeadmin/bp004-1f719050.diff b/redhat/kdeadmin/bp004-1f719050.diff new file mode 100644 index 000000000..97e90ba30 --- /dev/null +++ b/redhat/kdeadmin/bp004-1f719050.diff @@ -0,0 +1,32 @@ +commit 1f71905047d874cdc6c63049e566a4d7b976b0fc +Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Date: 1327530712 -0600 + + Fix linear alphabet string errors + +diff --git a/kcron/ctcron.cpp b/kcron/ctcron.cpp +index e470a72..f5cb04c 100644 +--- a/kcron/ctcron.cpp ++++ b/kcron/ctcron.cpp +@@ -178,7 +178,7 @@ istream& operator >> (istream& inputStream, CTCron& cron) + if ((line.find("#") == 0) && (line.find("\\") != 1)) + { + // If the first 10 characters don't contain a character, it's probably a disabled entry. +- int first_text = line.find_first_of("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPTQRSTUVWXYZ"); ++ int first_text = line.find_first_of("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"); + if (first_text < 0) + continue; + +diff --git a/kuser/misc.cpp b/kuser/misc.cpp +index 6b26a72..c16f563 100644 +--- a/kuser/misc.cpp ++++ b/kuser/misc.cpp +@@ -135,7 +135,7 @@ void addShell(const TQString &shell) + TQCString genSalt( int len ) + { + TQCString salt( len + 1 ); +- const char * set = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPTQRSTUVWXYZ0123456789./"; ++ const char * set = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./"; + + salt[0] = set[getpid() % strlen(set)]; + for( int i = 1; i < len; i++ ) { diff --git a/redhat/kdeadmin/kdeadmin-3.5.13-add_rhel_fedora.patch b/redhat/kdeadmin/kdeadmin-3.5.13-add_rhel_fedora.patch index 2ce36a0e2..9ba0d0d99 100644 --- a/redhat/kdeadmin/kdeadmin-3.5.13-add_rhel_fedora.patch +++ b/redhat/kdeadmin/kdeadmin-3.5.13-add_rhel_fedora.patch @@ -1,6 +1,158 @@ -diff -Nuar kdeadmin.ORI/knetworkconf/backends/network-conf.in kdeadmin.P/knetworkconf/backends/network-conf.in ---- kdeadmin.ORI/knetworkconf/backends/network-conf.in 2012-01-11 20:15:15.161715402 +0100 -+++ kdeadmin.P/knetworkconf/backends/network-conf.in 2012-01-11 20:39:21.746715574 +0100 +--- kdeadmin/knetworkconf/backends/service.pl.in.knetworkconf 2010-08-12 05:28:14.000000000 +0200 ++++ kdeadmin/knetworkconf/backends/service.pl.in 2012-05-03 11:09:05.093902723 +0200 +@@ -59,6 +59,9 @@ + "redhat-8.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], + "redhat-9" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], + "openna-1.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], ++ ++ "rhel-5" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], ++ "rhel-6" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], + + "mandrake-7.1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], + "mandrake-7.2" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], +@@ -110,6 +113,10 @@ + "fedora-5" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], + "rpath" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], + ++ "fedora-15" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], ++ "fedora-16" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], ++ "fedora-17" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], ++ + "vine-3.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], + "vine-3.1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], + "ark" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], +@@ -139,6 +146,9 @@ + "redhat-9" => [3, 5], + "openna-1.0" => [3, 5], + ++ "rhel-5" => [3, 5], ++ "rhel-6" => [3, 5], ++ + "mandrake-7.1" => [3, 5], + "mandrake-7.2" => [3, 5], + "mandrake-9.0" => [3, 5], +@@ -189,6 +199,10 @@ + "fedora-4" => [3, 5], + "fedora-5" => [3, 5], + "rpath" => [3, 5], ++ ++ "fedora-15" => [3, 5], ++ "fedora-16" => [3, 5], ++ "fedora-17" => [3, 5], + + "vine-3.0" => [3, 5], + "vine-3.1" => [3, 5], +@@ -218,6 +232,9 @@ + "redhat-9" => "redhat-5.2", + "openna-1.0" => "redhat-5.2", + ++ "rhel-5" => "redhat-5.2", ++ "rhel-6" => "redhat-5.2", ++ + "mandrake-7.1" => "redhat-5.2", + "mandrake-7.2" => "redhat-5.2", + "mandrake-9.0" => "redhat-5.2", +@@ -267,6 +284,10 @@ + "fedora-5" => "redhat-5.2", + "rpath" => "redhat-5.2", + ++ "fedora-15" => "redhat-5.2", ++ "fedora-16" => "redhat-5.2", ++ "fedora-17" => "redhat-5.2", ++ + "vine-3.0" => "redhat-5.2", + "vine-3.1" => "redhat-5.2", + "ark" => "redhat-5.2", +@@ -1744,12 +1765,17 @@ + "redhat-7.3" => \&gst_service_redhat_get_status, + "redhat-8.0" => \&gst_service_redhat_get_status, + "redhat-9" => \&gst_service_redhat_get_status, ++ "rhel-5" => \&gst_service_redhat_get_status, ++ "rhel-6" => \&gst_service_redhat_get_status, + "mandrake-7.2" => \&gst_service_redhat_get_status, + "fedora-1" => \&gst_service_redhat_get_status, + "fedora-2" => \&gst_service_redhat_get_status, + "fedora-3" => \&gst_service_redhat_get_status, + "fedora-4" => \&gst_service_redhat_get_status, + "fedora-5" => \&gst_service_redhat_get_status, ++ "fedora-15" => \&gst_service_redhat_get_status, ++ "fedora-16" => \&gst_service_redhat_get_status, ++ "fedora-17" => \&gst_service_redhat_get_status, + + "rpath" => \&gst_service_redhat_get_status, + +--- kdeadmin/knetworkconf/backends/platform.pl.in.knetworkconf 2011-10-19 07:30:39.000000000 +0200 ++++ kdeadmin/knetworkconf/backends/platform.pl.in 2012-05-03 11:07:51.399862363 +0200 +@@ -71,6 +71,8 @@ + "redhat-7.3" => "Red Hat Linux 7.3 Valhalla", + "redhat-8.0" => "Red Hat Linux 8.0 Psyche", + "redhat-9" => "Red Hat Linux 9.0 Shrike", ++ "rhel-5" => "Enterprise Linux 5", ++ "rhel-6" => "Enterprise Linux 6", + "openna-1.0" => "OpenNA Linux 1.0 VSLC", + "mandrake-7.1" => "Linux Mandrake 7.1", + "mandrake-7.2" => "Linux Mandrake 7.2 Odyssey", +@@ -116,6 +118,9 @@ + "fedora-3" => "Fedora Core 3 (Heidelberg)", + "fedora-4" => "Fedora Core 4 (Stentz)", + "fedora-5" => "Fedora Core 5 (Bordeaux)", ++ "fedora-15" => "Fedora 15 (LoveLock)", ++ "fedora-16" => "Fedora 16 (Verne)", ++ "fedora-17" => "Fedora 17 (Beefy Miracle)", + "rpath" => "rPath Linux", + "ark" => "Ark Linux", + }; +@@ -184,6 +189,27 @@ + return -1; + } + ++sub check_rhel ++{ ++ open RELEASE, "$gst_prefix/etc/redhat-release" or return -1; ++ while (<RELEASE>) ++ { ++ chomp; ++ if ( ++ (/^CentOS release (\d)([\d\.]+)\s+.*/) ++ or (/^Scientific Linux release (\d)([\d\.]+)\s+.*/) ++ or (/^Red Hat Enterprise Linux \w release (\d)([\d\.]+)\s+.*/) ++ ) ++ { ++ close RELEASE; ++ return "rhel-$1"; ++ } ++ } ++ close RELEASE; ++ return -1; ++} ++ ++ + sub check_openna + { + open OPENNA, "$gst_prefix/etc/openna-release" or return -1; +@@ -336,7 +362,10 @@ + $ver = $_; + chomp ($ver); + +- if ($ver =~ /^Fedora Core release (\S+)/) ++ if ( ++ ($ver =~ /^Fedora Core release (\S+)/) ++ or ($ver =~ /^Fedora release (\S+)/) ++ ) + { + close FEDORA; + return "fedora-$1"; +@@ -577,7 +606,7 @@ + my %check = ( + # Red Hat check must run after Vine, Mandrake and Fedora, and Mandrake after BlackPanther + "Linux" => [ \&check_lsb, \&check_debian, \&check_caldera, \&check_suse, \&check_blackpanther, \&check_vine, +- \&check_fedora, \&check_mandrake, \&check_mandriva, \&check_conectiva, \&check_linuxppc, \&check_redhat, \&check_openna, ++ \&check_fedora, \&check_mandrake, \&check_mandriva, \&check_conectiva, \&check_linuxppc, \&check_rhel, \&check_redhat, \&check_openna, + \&check_turbolinux, \&check_slackware, \&check_vlos, \&check_gentoo, \&check_pld, \&check_rpath, \&check_archlinux, \&check_ark ], + "FreeBSD" => [ \&check_freebsd ], + "SunOS" => [ \&check_solaris ] +--- kdeadmin/knetworkconf/backends/network-conf.in.knetworkconf 2010-08-12 05:28:14.000000000 +0200 ++++ kdeadmin/knetworkconf/backends/network-conf.in 2012-05-03 11:04:14.035793003 +0200 @@ -63,6 +63,7 @@ $version = "@VERSION@"; @platforms = ("redhat-5.2", "redhat-6.0", "redhat-6.1", "redhat-6.2", "redhat-7.0", "redhat-7.1", @@ -14,13 +166,12 @@ diff -Nuar kdeadmin.ORI/knetworkconf/backends/network-conf.in kdeadmin.P/knetwor "ubuntu-5.04", "ubuntu-5.10", "ubuntu-6.06", "ubuntu-6.10", "ubuntu-7.04", "ubuntu-7.10", "ubuntu-8.04", "ubuntu-8.10", "ubuntu-9.04", "ubuntu-9.10", "ubuntu-10.04", "ubuntu-10.10", "suse-7.0", "suse-9.0", "suse-9.1", - "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "rpath", -+ "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "rpath", "fedora-15", "fedora-16", ++ "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "rpath", "fedora-15", "fedora-16", "fedora-17", "pld-1.0", "pld-1.1", "pld-1.99", "conectiva-9", "conectiva-10", "vine-3.0", "vine-3.1", -diff -Nuar kdeadmin.ORI/knetworkconf/backends/network.pl.in kdeadmin.P/knetworkconf/backends/network.pl.in ---- kdeadmin.ORI/knetworkconf/backends/network.pl.in 2012-01-11 20:15:15.161715402 +0100 -+++ kdeadmin.P/knetworkconf/backends/network.pl.in 2012-01-11 20:33:43.120340531 +0100 +--- kdeadmin/knetworkconf/backends/network.pl.in.knetworkconf 2011-08-13 08:35:25.000000000 +0200 ++++ kdeadmin/knetworkconf/backends/network.pl.in 2012-05-03 11:05:51.621170496 +0200 @@ -492,6 +492,8 @@ "redhat-7.2" => "redhat-6.2", "redhat-8.0" => "redhat-6.2", @@ -30,16 +181,17 @@ diff -Nuar kdeadmin.ORI/knetworkconf/backends/network.pl.in kdeadmin.P/knetworkc "openna-1.0" => "redhat-6.2", "debian-2.2" => "debian-2.2", "debian-3.0" => "debian-2.2", -@@ -538,6 +540,8 @@ +@@ -538,6 +540,9 @@ "fedora-3" => "redhat-6.2", "fedora-4" => "redhat-6.2", "fedora-5" => "redhat-6.2", + "fedora-15" => "redhat-6.2", + "fedora-16" => "redhat-6.2", ++ "fedora-17" => "redhat-6.2", "rpath" => "redhat-6.2", "vine-3.0" => "redhat-6.2", "vine-3.1" => "redhat-6.2", -@@ -1816,6 +1820,8 @@ +@@ -1816,6 +1821,8 @@ "redhat-7.2" => \&gst_network_rh72_get_file, "redhat-8.0" => \&gst_network_rh72_get_file, "redhat-9" => \&gst_network_rh72_get_file, @@ -48,16 +200,17 @@ diff -Nuar kdeadmin.ORI/knetworkconf/backends/network.pl.in kdeadmin.P/knetworkc "openna-1.0" => \&gst_network_rh62_get_file, "mandrake-7.2" => \&gst_network_rh62_get_file, "mandrake-7.1" => \&gst_network_rh62_get_file, -@@ -1863,6 +1869,8 @@ +@@ -1863,6 +1870,9 @@ "fedora-3" => \&gst_network_rh72_get_file, "fedora-4" => \&gst_network_rh72_get_file, "fedora-5" => \&gst_network_rh72_get_file, + "fedora-15" => \&gst_network_rh72_get_file, + "fedora-16" => \&gst_network_rh72_get_file, ++ "fedora-17" => \&gst_network_rh72_get_file, "rpath" => \&gst_network_rh72_get_file, "vine-3.0" => \&gst_network_rh62_get_file, "vine-3.1" => \&gst_network_rh62_get_file, -@@ -3961,6 +3969,8 @@ +@@ -3961,6 +3971,8 @@ "redhat-7.2" => "lo", "redhat-8.0" => "lo", "redhat-9" => "", @@ -66,16 +219,17 @@ diff -Nuar kdeadmin.ORI/knetworkconf/backends/network.pl.in kdeadmin.P/knetworkc "openna-1.0" => "lo", "mandrake-7.1" => "lo", "mandrake-7.2" => "lo", -@@ -4008,6 +4018,8 @@ +@@ -4008,6 +4020,9 @@ "fedora-3" => "", "fedora-4" => "", "fedora-5" => "", + "fedora-15" => "", + "fedora-16" => "", ++ "fedora-17" => "", "rpath" => "", "vine-3.0" => "lo", "vine-3.1" => "lo", -@@ -4150,6 +4162,8 @@ +@@ -4150,6 +4165,8 @@ "redhat-7.2" => "redhat-7.2", "redhat-8.0" => "redhat-7.2", "redhat-9" => "redhat-7.2", @@ -84,16 +238,17 @@ diff -Nuar kdeadmin.ORI/knetworkconf/backends/network.pl.in kdeadmin.P/knetworkc "openna-1.0" => "redhat-6.2", "mandrake-7.1" => "redhat-6.2", "mandrake-7.2" => "redhat-6.2", -@@ -4197,6 +4211,8 @@ +@@ -4197,6 +4214,9 @@ "fedora-3" => "redhat-7.2", "fedora-4" => "redhat-7.2", "fedora-5" => "redhat-7.2", + "fedora-15" => "redhat-7.2", + "fedora-16" => "redhat-7.2", ++ "fedora-17" => "redhat-7.2", "rpath" => "redhat-7.2", "vine-3.0" => "redhat-7.0", "vine-3.1" => "redhat-7.0", -@@ -4585,6 +4604,8 @@ +@@ -4585,6 +4605,8 @@ "redhat-7.2" => "redhat-7.2", "redhat-8.0" => "redhat-8.0", "redhat-9" => "redhat-8.0", @@ -102,16 +257,17 @@ diff -Nuar kdeadmin.ORI/knetworkconf/backends/network.pl.in kdeadmin.P/knetworkc "openna-1.0" => "redhat-6.2", "mandrake-7.1" => "redhat-6.2", "mandrake-7.2" => "redhat-6.2", -@@ -4632,6 +4650,8 @@ +@@ -4632,6 +4654,9 @@ "fedora-3" => "redhat-7.2", "fedora-4" => "redhat-7.2", "fedora-5" => "redhat-7.2", + "fedora-15" => "redhat-7.2", + "fedora-16" => "redhat-7.2", ++ "fedora-17" => "redhat-7.2", "rpath" => "redhat-7.2", "vine-3.0" => "vine-3.0", "vine-3.1" => "vine-3.0", -@@ -5445,6 +5465,8 @@ +@@ -5445,6 +5470,8 @@ "redhat-7.2" => "redhat-7.2", "redhat-8.0" => "redhat-7.2", "redhat-9" => "redhat-7.2", @@ -120,16 +276,17 @@ diff -Nuar kdeadmin.ORI/knetworkconf/backends/network.pl.in kdeadmin.P/knetworkc "mandrake-7.1" => "redhat-6.2", "mandrake-7.2" => "redhat-6.2", "mandrake-9.0" => "redhat-7.0", -@@ -5491,6 +5513,8 @@ +@@ -5491,6 +5518,9 @@ "fedora-3" => "redhat-7.2", "fedora-4" => "redhat-7.2", "fedora-5" => "redhat-7.2", + "fedora-15" => "redhat-7.2", + "fedora-16" => "redhat-7.2", ++ "fedora-17" => "redhat-7.2", "rpath" => "redhat-7.2", "vine-3.0" => "redhat-7.0", "vine-3.1" => "redhat-7.0", -@@ -5872,6 +5896,8 @@ +@@ -5872,6 +5902,8 @@ "redhat-7.2" => "redhat-7.2", "redhat-8.0" => "redhat-8.0", "redhat-9" => "redhat-8.0", @@ -138,150 +295,13 @@ diff -Nuar kdeadmin.ORI/knetworkconf/backends/network.pl.in kdeadmin.P/knetworkc "mandrake-7.1" => "redhat-6.2", "mandrake-7.2" => "redhat-6.2", "mandrake-9.0" => "mandrake-9.0", -@@ -5918,6 +5944,8 @@ +@@ -5918,6 +5950,9 @@ "fedora-3" => "redhat-7.2", "fedora-4" => "redhat-7.2", "fedora-5" => "redhat-7.2", + "fedora-15" => "redhat-7.2", + "fedora-16" => "redhat-7.2", ++ "fedora-17" => "redhat-7.2", "rpath" => "redhat-7.2", "vine-3.0" => "vine-3.0", "vine-3.1" => "vine-3.0", -diff -Nuar kdeadmin.ORI/knetworkconf/backends/platform.pl.in kdeadmin.P/knetworkconf/backends/platform.pl.in ---- kdeadmin.ORI/knetworkconf/backends/platform.pl.in 2012-01-11 20:15:15.161715402 +0100 -+++ kdeadmin.P/knetworkconf/backends/platform.pl.in 2012-01-11 20:38:27.401468302 +0100 -@@ -71,6 +71,8 @@ - "redhat-7.3" => "Red Hat Linux 7.3 Valhalla", - "redhat-8.0" => "Red Hat Linux 8.0 Psyche", - "redhat-9" => "Red Hat Linux 9.0 Shrike", -+ "rhel-5" => "Enterprise Linux 5", -+ "rhel-6" => "Enterprise Linux 6", - "openna-1.0" => "OpenNA Linux 1.0 VSLC", - "mandrake-7.1" => "Linux Mandrake 7.1", - "mandrake-7.2" => "Linux Mandrake 7.2 Odyssey", -@@ -116,6 +118,8 @@ - "fedora-3" => "Fedora Core 3 (Heidelberg)", - "fedora-4" => "Fedora Core 4 (Stentz)", - "fedora-5" => "Fedora Core 5 (Bordeaux)", -+ "fedora-15" => "Fedora 15 (LoveLock)", -+ "fedora-16" => "Fedora 16 (Verne)", - "rpath" => "rPath Linux", - "ark" => "Ark Linux", - }; -@@ -184,6 +188,27 @@ - return -1; - } - -+sub check_rhel -+{ -+ open RELEASE, "$gst_prefix/etc/redhat-release" or return -1; -+ while (<RELEASE>) -+ { -+ chomp; -+ if ( -+ (/^CentOS release (\d)([\d\.]+)\s+.*/) -+ or (/^Scientific Linux release (\d)([\d\.]+)\s+.*/) -+ or (/^Red Hat Enterprise Linux \w release (\d)([\d\.]+)\s+.*/) -+ ) -+ { -+ close RELEASE; -+ return "rhel-$1"; -+ } -+ } -+ close RELEASE; -+ return -1; -+} -+ -+ - sub check_openna - { - open OPENNA, "$gst_prefix/etc/openna-release" or return -1; -@@ -577,7 +602,7 @@ - my %check = ( - # Red Hat check must run after Vine, Mandrake and Fedora, and Mandrake after BlackPanther - "Linux" => [ \&check_lsb, \&check_debian, \&check_caldera, \&check_suse, \&check_blackpanther, \&check_vine, -- \&check_fedora, \&check_mandrake, \&check_mandriva, \&check_conectiva, \&check_linuxppc, \&check_redhat, \&check_openna, -+ \&check_fedora, \&check_mandrake, \&check_mandriva, \&check_conectiva, \&check_linuxppc, \&check_rhel, \&check_redhat, \&check_openna, - \&check_turbolinux, \&check_slackware, \&check_vlos, \&check_gentoo, \&check_pld, \&check_rpath, \&check_archlinux, \&check_ark ], - "FreeBSD" => [ \&check_freebsd ], - "SunOS" => [ \&check_solaris ] -diff -Nuar kdeadmin.ORI/knetworkconf/backends/service.pl.in kdeadmin.P/knetworkconf/backends/service.pl.in ---- kdeadmin.ORI/knetworkconf/backends/service.pl.in 2012-01-11 20:15:15.160715344 +0100 -+++ kdeadmin.P/knetworkconf/backends/service.pl.in 2012-01-11 20:21:36.452645160 +0100 -@@ -59,6 +59,9 @@ - "redhat-8.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], - "redhat-9" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], - "openna-1.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], -+ -+ "rhel-5" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], -+ "rhel-6" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], - - "mandrake-7.1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], - "mandrake-7.2" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], -@@ -110,6 +113,9 @@ - "fedora-5" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], - "rpath" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], - -+ "fedora-15" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], -+ "fedora-16" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], -+ - "vine-3.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], - "vine-3.1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], - "ark" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], -@@ -139,6 +145,9 @@ - "redhat-9" => [3, 5], - "openna-1.0" => [3, 5], - -+ "rhel-5" => [3, 5], -+ "rhel-6" => [3, 5], -+ - "mandrake-7.1" => [3, 5], - "mandrake-7.2" => [3, 5], - "mandrake-9.0" => [3, 5], -@@ -189,6 +198,9 @@ - "fedora-4" => [3, 5], - "fedora-5" => [3, 5], - "rpath" => [3, 5], -+ -+ "fedora-15" => [3, 5], -+ "fedora-16" => [3, 5], - - "vine-3.0" => [3, 5], - "vine-3.1" => [3, 5], -@@ -218,6 +230,9 @@ - "redhat-9" => "redhat-5.2", - "openna-1.0" => "redhat-5.2", - -+ "rhel-5" => "redhat-5.2", -+ "rhel-6" => "redhat-5.2", -+ - "mandrake-7.1" => "redhat-5.2", - "mandrake-7.2" => "redhat-5.2", - "mandrake-9.0" => "redhat-5.2", -@@ -267,6 +282,9 @@ - "fedora-5" => "redhat-5.2", - "rpath" => "redhat-5.2", - -+ "fedora-15" => "redhat-5.2", -+ "fedora-16" => "redhat-5.2", -+ - "vine-3.0" => "redhat-5.2", - "vine-3.1" => "redhat-5.2", - "ark" => "redhat-5.2", -@@ -1744,12 +1762,16 @@ - "redhat-7.3" => \&gst_service_redhat_get_status, - "redhat-8.0" => \&gst_service_redhat_get_status, - "redhat-9" => \&gst_service_redhat_get_status, -+ "rhel-5" => \&gst_service_redhat_get_status, -+ "rhel-6" => \&gst_service_redhat_get_status, - "mandrake-7.2" => \&gst_service_redhat_get_status, - "fedora-1" => \&gst_service_redhat_get_status, - "fedora-2" => \&gst_service_redhat_get_status, - "fedora-3" => \&gst_service_redhat_get_status, - "fedora-4" => \&gst_service_redhat_get_status, - "fedora-5" => \&gst_service_redhat_get_status, -+ "fedora-15" => \&gst_service_redhat_get_status, -+ "fedora-16" => \&gst_service_redhat_get_status, - - "rpath" => \&gst_service_redhat_get_status, - diff --git a/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec b/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec index dd52c4543..87383392a 100644 --- a/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec +++ b/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 3 +%define release 4 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -39,8 +39,11 @@ Source5: kpackagerc Source6: ksysvrc Source7: kuserrc -# [kdeadmin/knetworkconf] Add RHEL 5, RHEL 6, Fedora 15, Fedora 16 -Patch0: kdeadmin-3.5.13-add_rhel_fedora.patch +# [kdeadmin/knetworkconf] Add RHEL 5, RHEL 6, Fedora 15, Fedora 16, Fedora 17 +Patch1: kdeadmin-3.5.13-add_rhel_fedora.patch + +# [kdeadmin] Fix linear alphabet string errors [Commit #1f719050] +Patch2: bp004-1f719050.diff Requires: trinity-kdelibs Requires: pkgconfig @@ -50,23 +53,24 @@ BuildRequires: trinity-kdelibs-devel BuildRequires: rpm-devel %description -The kdeadmin package includes administrative tools for the K Desktop -Environment (KDE) including: +The kdeadmin package includes administrative tools for the Trinity Desktop +Environment (TDE) including: kcron, kdat, knetworkconf, kpackage, ksysv, kuser. %prep %setup -q -n kdeadmin -%patch0 -p1 + +%patch1 -p1 -b .knetworkconf # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -171,6 +175,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Thu Apr 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4 +- Fix knetworkconf support for Fedora, adds Fedora 17 +- Fix linear alphabet string errors [Commit #1f719050] + * Wed Jan 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 - Add knetworkconf support for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - Remove 'consolehelper' macro diff --git a/redhat/kdegames/trinity-kdegames-3.5.13.spec b/redhat/kdegames/trinity-kdegames-3.5.13.spec index a3d0206a3..1c9686f6a 100644 --- a/redhat/kdegames/trinity-kdegames-3.5.13.spec +++ b/redhat/kdegames/trinity-kdegames-3.5.13.spec @@ -7,10 +7,10 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc +%define _docdir %{_datadir}/doc %endif -# TDE 3.5.12 specific building variables +# TDE 3.5.13 specific building variables BuildRequires: autoconf automake libtool m4 %define tde_docdir %{_docdir}/kde %define tde_includedir %{_includedir}/kde @@ -54,7 +54,7 @@ Summary: Development files for %{name} Group: Development/Libraries License: LGPLv2 Provides: kdegames3-devel = %{version}-%{release} -Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: trinity-kdelibs-devel %description devel %{summary}. @@ -67,7 +67,7 @@ Group: System Environment/Libraries Requires: trinity-kdelibs License: LGPLv2 # include to paranoid, installing libs-only is still mostly untested -- Rex -#Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +#Requires: %{name} = %{version}-%{release} %description libs %{summary}. @@ -80,11 +80,11 @@ License: LGPLv2 # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" diff --git a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec index dcf549729..067de78ea 100644 --- a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec +++ b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec @@ -76,7 +76,7 @@ BuildRequires: OpenEXR-devel # kpdf BuildRequires: freetype-devel BuildRequires: poppler-devel -BuildRequires: poppler-qt-devel >= 0.12 +BuildRequires: poppler-qt3-devel >= 0.12 BuildRequires: libpaper-devel # ksvg %if 0%{?with_ksvg} diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec index 2ed52e51b..5c2989d21 100755 --- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec +++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec @@ -44,11 +44,11 @@ Patch10: kdelibs-3.5.13-maxlinelength.patch Patch11: kdelibs-3.5.13-enable_pcre.patch ## [kdelibs/kate] Updated syntax highlighting files [Bug #764] Patch12: kdelibs-3.5.13-kate_syntax.patch.gz -## [kdelibs] Adds Inotify support (backport commit 24f144faf98249012e7b1657a5dfe93750f0dfde) +## [kdelibs] Adds Inotify support (backport commit 24f144fa) Patch13: kdelibs-3.5.13-add_inotify_support.patch -## [kdelibs] Add fam/gamin support to tdelibs CMake (backport commit 2b035349c31fe64c31d2c050892b117a3a807179) +## [kdelibs] Add fam/gamin support to tdelibs CMake (backport commit 2b035349) Patch14: kdelibs-3.5.13-enable_fam_gamin.patch -## [kdelibs/kioslave/http] Fix UTF8 Encoding for WebDAV directories +## [kdelibs/kioslave/http] Fix UTF8 Encoding for WebDAV directories [Bug #766] [Commit #e131f10b] Patch15: kdelibs-3.5.13-fix_UTF8_encoding_for_WebDAV_directories.patch ## [kdelibs/kdeprint] Fix add printer [Bug #383] Patch16: kdelibs-3.5.13-fix_add_printer.patch diff --git a/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_linear_alphabet.patch b/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_linear_alphabet.patch new file mode 100644 index 000000000..4bd48f89a --- /dev/null +++ b/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_linear_alphabet.patch @@ -0,0 +1,19 @@ +commit fd6afacf70587de329d9b2647b96469bae5e74da +Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Date: 1327530995 -0600 + + Fix linear alphabet string errors + +diff --git a/mpg123_artsplugin/mpg123/httpget.c b/mpg123_artsplugin/mpg123/httpget.c +index 12c6941..7175011 100644 +--- a/mpg123_artsplugin/mpg123/httpget.c ++++ b/mpg123_artsplugin/mpg123/httpget.c +@@ -83,7 +83,7 @@ void readstring (char *string, int maxlen, FILE *f) + void encode64 (char *source,char *destination) + { + static char *Base64Digits = +- "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; ++ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + int n = 0; + int ssiz=strlen(source); + int i; diff --git a/redhat/kdemultimedia/kdemultimedia-3.5.13-remove_more_applications.patch b/redhat/kdemultimedia/kdemultimedia-3.5.13-remove_more_applications.patch new file mode 100644 index 000000000..213fd6410 --- /dev/null +++ b/redhat/kdemultimedia/kdemultimedia-3.5.13-remove_more_applications.patch @@ -0,0 +1,49 @@ +commit 31e44a7b933cb32eaf1c9e3d8bbbaae806963956 +Author: Darrell Anderson <humanreadable@yahoo.com> +Date: 1331690438 -0500 + + Remove "More Applications" from TDE menu. + This partially resolves bug report 653. + +diff --git a/arts/builder/artsbuilder.desktop b/arts/builder/artsbuilder.desktop +index 52a1b53..22e78e3 100644 +--- a/arts/builder/artsbuilder.desktop ++++ b/arts/builder/artsbuilder.desktop +@@ -119,5 +119,5 @@ MimeType=application/x-artsbuilder; + DocPath=artsbuilder/index.html + X-DCOP-ServiceType=Multi + OnlyShowIn=KDE; +-Categories=Qt;KDE;AudioVideo;X-KDE-More; ++Categories=Qt;KDE;AudioVideo; + NoDisplay=true +diff --git a/arts/tools/artscontrol.desktop b/arts/tools/artscontrol.desktop +index d4bc38f..39a2640 100644 +--- a/arts/tools/artscontrol.desktop ++++ b/arts/tools/artscontrol.desktop +@@ -133,5 +133,5 @@ Terminal=false + X-DCOP-ServiceType=Multi + DocPath=artsbuilder/index.html + OnlyShowIn=KDE; +-Categories=Qt;KDE;AudioVideo;X-KDE-More; ++Categories=Qt;KDE;AudioVideo; + NoDisplay=true +diff --git a/kaboodle/kaboodle.desktop b/kaboodle/kaboodle.desktop +index 2bddd99..f8f96e9 100644 +--- a/kaboodle/kaboodle.desktop ++++ b/kaboodle/kaboodle.desktop +@@ -80,4 +80,4 @@ GenericName[zu]=Umdlali Womculo + Terminal=false + InitialPreference=6 + X-DCOP-ServiceType=Multi +-Categories=Qt;KDE;AudioVideo;X-KDE-More; ++Categories=Qt;KDE;AudioVideo; +diff --git a/kmid/kmid.desktop b/kmid/kmid.desktop +index 3920b85..f99bdda 100644 +--- a/kmid/kmid.desktop ++++ b/kmid/kmid.desktop +@@ -85,4 +85,4 @@ ServiceTypes=Browser/View + X-KDE-Library=libkmidpart + X-KDE-StartupNotify=true + X-DCOP-ServiceType=Multi +-Categories=Qt;KDE;AudioVideo;X-KDE-More; ++Categories=Qt;KDE;AudioVideo; diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec index d896d0a06..b448d96b6 100644 --- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec +++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 5 +%define release 6 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -56,6 +56,11 @@ Patch5: kdemultimedia-3.5.7-pthread.patch # [kdemultimedia] Fix MMX detection [Bug #800] Patch10: kdemultimedia-3.5.13-fix_mmx_detection.patch +# [tdemultimedia] Remove "More Applications" from TDE menu. [Commit #31e44a7b] +Patch21: kdemultimedia-3.5.13-remove_more_applications.patch +# [tdemultimedia] Fix linear alphabet string errors [Commit #fd6afacf] +Patch22: kdemultimedia-3.5.13-fix_linear_alphabet.patch + Requires: %{name}-libs = %{version}-%{release} @@ -72,7 +77,7 @@ BuildRequires: alsa-lib-devel BuildRequires: cdparanoia-devel cdparanoia BuildRequires: gstreamer-devel BuildRequires: automake libtool -%{?_with_akode:BuildRequires: akode-devel} +%{?_with_akode:BuildRequires: trinity-akode-devel} %{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel libtunepimp-devel} %{?_with_taglib:BuildRequires: taglib-devel} %{?_with_xine:BuildRequires: xine-lib-devel} @@ -136,15 +141,17 @@ Requires: %{name} = %{version}-%{release} %patch3 -p1 -b .xdg %patch5 -p1 -b .pthread %patch10 -p1 +%patch21 -p1 +%patch22 -p1 # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -172,7 +179,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}" %{?_with_musicbrainz} %{!?_with_musicbrainz:--without-musicbrainz} \ %{?_with_taglib} %{!?_with_taglib:--without-taglib} \ %{?_with_xine} %{!?_with_xine:--without-xine} \ - --with-extra-includes=%{_usr}/include/cdda:%{_includedir}/tqt \ + --with-extra-includes="%{_usr}/include/cdda:%{_includedir}/tqt" \ --enable-closure %__make %{?_smp_mflags} @@ -415,6 +422,11 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_libdir}/libyafxplayer.so %changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6 +- Updates BuildRequires +- Remove "More Applications" from TDE menu. [Commit #31e44a7b] +- Fix linear alphabet string errors [Commit #fd6afacf] + * Mon Jan 16 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5 - Enables 'akode' support - Fix MMX support [Bug #800] diff --git a/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec b/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec index 82f176b5e..d5ca26124 100644 --- a/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec +++ b/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec @@ -58,13 +58,14 @@ Patch4: kdenetwork-3.2.3-resolv.patch # include more/proper ppp headers Patch6: kdenetwork-3.5.9-krfb_httpd.patch -# TDE 3.5.13 Fedora/RHEL patches +# [kdenetwork] Fix kopete protocol compilation [Bug #695] Patch10: kdenetwork-3.5.13-kopete_msn_protocol.patch Patch11: kdenetwork-3.5.13-kopete_sms_protocol.patch Patch12: kdenetwork-3.5.13-kopete_jabber_protocol.patch Patch13: kdenetwork-3.5.13-kopete_motionawayplugin_ftbfs.patch +# [kdenetwork] Fix references to "qname.h" [Bug #700] Patch14: kdenetwork-3.5.13-reference_to_qmake_h.patch -# WTF is this ? shitty hack in autotool was forgotten in CMAKE port ! +# WTF is this ? shitty hack in autotool was forgotten in CMAKE port ! [Bug #695] Source10: kdenetwork-3.5.13-dummy.cpp Requires: %{name}-libs = %{version}-%{release} diff --git a/redhat/kdepim/kdepim-3.5.13-fix_check_mail.patch b/redhat/kdepim/kdepim-3.5.13-fix_check_mail.patch new file mode 100644 index 000000000..b5558cd19 --- /dev/null +++ b/redhat/kdepim/kdepim-3.5.13-fix_check_mail.patch @@ -0,0 +1,21 @@ +commit 2d5f15c865de75f3147bd849ef81d3ed034f8104 +Author: Darrell Anderson <humanreadable@yahoo.com> +Date: 1335654338 -0500 + + Reverse patch from GIT hash 33e649c9. + This resolves bug report 406. + Thanks to Slavek Banko. + +diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp +index 227f48c..cb9db70 100644 +--- a/kmail/kmcomposewin.cpp ++++ b/kmail/kmcomposewin.cpp +@@ -4351,8 +4351,6 @@ void KMComposeWin::slotContinueDoSend( bool sentOk ) + } + (*it)->cleanupHeader(); + sentOk = kmkernel->msgSender()->send((*it), mSendMethod); +- if (sentOk) +- kmkernel->acctMgr()->checkMail(true); + } + + if (!sentOk) diff --git a/redhat/kdepim/kdepim-3.5.13-fix_composer_crash.patch b/redhat/kdepim/kdepim-3.5.13-fix_composer_crash.patch new file mode 100644 index 000000000..4ee139a44 --- /dev/null +++ b/redhat/kdepim/kdepim-3.5.13-fix_composer_crash.patch @@ -0,0 +1,20 @@ +commit 84f29704e3fadcf1afb22da208e1dbb87feb7718 +Author: Serghei Amelian <serghei.amelian@gmail.com> +Date: 1333065429 +0300 + + [kmail] fixed composer crash + +diff --git a/kmail/mailcomposerIface.h b/kmail/mailcomposerIface.h +index 2858657..4cba7f3 100644 +--- a/kmail/mailcomposerIface.h ++++ b/kmail/mailcomposerIface.h +@@ -13,6 +13,9 @@ + class MailComposerIface : virtual public DCOPObject + { + K_DCOP ++ ++ public: MailComposerIface() : DCOPObject("MailComposerIface") {} ++ + k_dcop: + /** + Send message. diff --git a/redhat/kdepim/trinity-kdepim-3.5.13.spec b/redhat/kdepim/trinity-kdepim-3.5.13.spec index 3cbfc506a..0f93717a4 100644 --- a/redhat/kdepim/trinity-kdepim-3.5.13.spec +++ b/redhat/kdepim/trinity-kdepim-3.5.13.spec @@ -7,7 +7,7 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc +%define _docdir %{_datadir}/doc %endif # TDE 3.5.13 specific building variables @@ -40,6 +40,11 @@ Source0: kdepim-%{version}.tar.gz # [kdepim] Fix compilation with GCC 4.7 [Bug #958] Patch1: kdepim-3.5.13-fix_gcc47_compilation.patch +# [tdepim] Reverse patch from GIT hash 33e649c9. [Bug #406] [Commit #2d5f15c8] +Patch2: kdepim-3.5.13-fix_check_mail.patch + +# [tdepim] Fix kmail composer crash [Bug #953] +Patch3: kdepim-3.5.13-fix_composer_crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -87,6 +92,8 @@ Development files for %{name}. %prep %setup -q -n kdepim %patch1 -p1 -b .gcc47 +%patch2 -p1 +%patch3 -p1 %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -122,8 +129,7 @@ cd build -DBUILD_ALL=ON \ .. -# Do not use %{?_smp_mflags} ! -%__make +%__make %{?_smp_mflags} %install export PATH="%{_bindir}:${PATH}" @@ -172,6 +178,8 @@ export PATH="%{_bindir}:${PATH}" %changelog * Wed Apr 25 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4 - Fix compilation with GCC 4.7 [Bug #958] +- Reverse patch from GIT hash 33e649c9. [Bug #406] [Commit #2d5f15c8] +- Fix kmail composer crash [Bug #953] * Sun Nov 27 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 - Add missing files '*.la' diff --git a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec index 657e53abe..75288260f 100755 --- a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec +++ b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec @@ -121,13 +121,12 @@ More Utilities for the K Desktop Environment: # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" -%__make -f admin/Makefile.common +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" %build unset QTDIR || : ; source /etc/profile.d/qt.sh diff --git a/redhat/kdevelop/c_cpp_reference-2.0.2-install.patch b/redhat/kdevelop/c_cpp_reference-2.0.2-install.patch new file mode 100644 index 000000000..28a24eefb --- /dev/null +++ b/redhat/kdevelop/c_cpp_reference-2.0.2-install.patch @@ -0,0 +1,9 @@ +--- kdevelop/c_cpp_reference-2.0.2_for_KDE_3.0/reference/C/CONTRIB/SNIP/Makefile.am.ORI 2012-05-01 09:52:59.334490901 -0400 ++++ kdevelop/c_cpp_reference-2.0.2_for_KDE_3.0/reference/C/CONTRIB/SNIP/Makefile.am 2012-05-01 09:53:10.229644843 -0400 +@@ -1,5 +1,5 @@ + EXTRA_DIST = $(wildcard *.html) $(wildcard *.c) $(wildcard *.h) $(wildcard *.asm) $(wildcard *.txt) \ +- 8087_sav.asm HEADER.html c_lines.awk except.doc file_id.diz make.ini match.doc myio.cpp \ ++ HEADER.html c_lines.awk except.doc file_id.diz make.ini match.doc myio.cpp \ + myio.mak myiodemo.cpp myline.cpp mystream.cpp pdn.lst read.me resource.lst rg_qsort.c1 \ + rg_qsort.c2 snippets._c_ snippets.ndx snippets.txt snippets.wc storage.typ str.cpp str.doc + diff --git a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec index e47bc717e..79a037dfb 100644 --- a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec +++ b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 2 +%define release 3 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -47,6 +47,8 @@ Patch1: c_cpp_reference-2.0.2-config.patch Patch2: kdevelop-3.5.13-kdevdesigner-ftbfs.patch # Fix compilation with GCC 4.7 Patch3: kdevelop-3.5.13-gcc47.patch +# Fix installation of 'asm' files +Patch4: c_cpp_reference-2.0.2-install.patch Provides: kdevelop3 = %{version}-%{release} @@ -128,6 +130,7 @@ Requires: %{name} = %{version}-%{release} %patch1 -p0 -b .config %patch2 -p1 %patch3 -p1 -b .gcc47 +%patch4 -p1 # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! @@ -234,6 +237,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 +- Fix installation on Fedora 17 +- Fix compilation on GCC 4.7 + * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2 - Fix HTML directory location diff --git a/redhat/libraries/libkipi/trinity-libkipi.spec b/redhat/libraries/libkipi/trinity-libkipi.spec index fad0abae5..130fb1507 100644 --- a/redhat/libraries/libkipi/trinity-libkipi.spec +++ b/redhat/libraries/libkipi/trinity-libkipi.spec @@ -70,12 +70,13 @@ Homepage: http://www.kipi-plugins.org/ # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" -%__make -f admin/Makefile.common +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" %build unset QTDIR || : ; source /etc/profile.d/qt.sh diff --git a/redhat/libraries/libksquirrel/trinity-libksquirrel.spec b/redhat/libraries/libksquirrel/trinity-libksquirrel.spec index 0be591792..6a1659ace 100644 --- a/redhat/libraries/libksquirrel/trinity-libksquirrel.spec +++ b/redhat/libraries/libksquirrel/trinity-libksquirrel.spec @@ -78,12 +78,13 @@ Tools for KSquirrel. # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" cvs +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" %build @@ -109,13 +110,9 @@ export PATH="%{_bindir}:${PATH}" %post /sbin/ldconfig -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun /sbin/ldconfig -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %files diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_gcc47_compilation.patch b/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_gcc47_compilation.patch new file mode 100644 index 000000000..199c7e0ae --- /dev/null +++ b/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_gcc47_compilation.patch @@ -0,0 +1,33 @@ +--- python-trinity/sip/kdecore/kaccel.sip.ORI 2012-05-01 23:10:27.686395190 +0200 ++++ python-trinity/sip/kdecore/kaccel.sip 2012-05-01 23:10:39.955113222 +0200 +@@ -35,7 +35,7 @@ + KAccel (QWidget* /TransferThis/, const char* = 0); + KAccel (QWidget*, QObject* /TransferThis/, const char* = 0); + KAccelActions& actions (); +- bool isEnabled () const; ++ bool isEnabled (); + void setEnabled (bool); + bool setAutoUpdate (bool); + +--- python-trinity/sip/kdecore/kaccelbase.sip.ORI 2012-05-01 23:13:58.455551130 +0200 ++++ python-trinity/sip/kdecore/kaccelbase.sip 2012-05-01 23:14:14.835174681 +0200 +@@ -48,7 +48,7 @@ + KAccelBase (int); + uint actionCount () const; + KAccelActions& actions (); +- bool isEnabled () const; ++ bool isEnabled (); + KAccelAction* actionPtr (const QString&); + KAccelAction* actionPtr (const KKey&); + KAccelAction* actionPtr (const KKeyServer::Key&); +--- python-trinity/sip/kdecore/kglobalaccel.sip.ORI 2012-05-01 23:19:11.934346517 +0200 ++++ python-trinity/sip/kdecore/kglobalaccel.sip 2012-05-01 23:19:18.755189755 +0200 +@@ -33,7 +33,7 @@ + + public: + KGlobalAccel (QObject*, const char* = 0); +- bool isEnabled () const; ++ bool isEnabled (); + void setEnabled (bool); + KAccelAction* insert (const QString&, const QString&, const QString&, const KShortcut&, const KShortcut&, SIP_RXOBJ_CON, SIP_SLOT_CON (), bool = 1, bool = 1); + diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13-install_directories.patch b/redhat/libraries/python-trinity/python-trinity-3.5.13-install_directories.patch index a2949fc2b..4ca22d637 100644 --- a/redhat/libraries/python-trinity/python-trinity-3.5.13-install_directories.patch +++ b/redhat/libraries/python-trinity/python-trinity-3.5.13-install_directories.patch @@ -1,5 +1,5 @@ ---- configure.py.ORI 2011-12-03 17:07:41.589390850 +0100 -+++ configure.py 2011-12-03 17:14:35.226888035 +0100 +--- a/configure.py.ORI 2011-12-03 17:07:41.589390850 +0100 ++++ b/configure.py 2011-12-03 17:14:35.226888035 +0100 @@ -786,7 +786,7 @@ sipconfig.ParentMakefile( configuration = pyqtcfg, diff --git a/redhat/libraries/python-trinity/python-trinity.spec b/redhat/libraries/python-trinity/python-trinity.spec index dec9a719a..0a1adfc82 100644 --- a/redhat/libraries/python-trinity/python-trinity.spec +++ b/redhat/libraries/python-trinity/python-trinity.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp python-trinity %define version 3.16.3 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -34,7 +34,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz ## RHEL/Fedora patches -Patch0: python-trinity-3.5.13-install_directories.patch +Patch1: python-trinity-3.5.13-install_directories.patch + +# [python-trinity] Fix compilation with GCC 4.7 +Patch2: python-trinity-3.5.13-fix_gcc47_compilation.patch BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel @@ -75,11 +78,12 @@ tips and working code you can use to learn from. %prep %setup -q -n libraries/%{kdecomp} -%patch0 -p0 +%patch1 -p1 +%patch2 -p1 # Hack to get TQT include files under /opt %__sed -i "configure.py" \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" %build export PATH="%{_bindir}:${PATH}" @@ -125,5 +129,9 @@ export PATH="%{_bindir}:${PATH}" %Changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.16.3-2 +- Rebuild for Fedora 17 +- Fix compilation with GCC 4.7 + * Fri Dec 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.16.3-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/main b/redhat/main new file mode 120000 index 000000000..945c9b46d --- /dev/null +++ b/redhat/main @@ -0,0 +1 @@ +.
\ No newline at end of file diff --git a/redhat/tdebase b/redhat/tdebase new file mode 120000 index 000000000..40cf4e3ad --- /dev/null +++ b/redhat/tdebase @@ -0,0 +1 @@ +kdebase
\ No newline at end of file |