diff options
| author | François Andriot <[email protected]> | 2014-09-29 13:37:37 +0200 |
|---|---|---|
| committer | François Andriot <[email protected]> | 2014-09-29 13:37:37 +0200 |
| commit | b4b507c636506960fb306de332ec30be399758dc (patch) | |
| tree | ffb4ce999cd5efe03a7cfee6c48a0cba49ba97af /redhat | |
| parent | f9a697dd364d6be35ec52794e97bca3187a06777 (diff) | |
| parent | 1baab4923d9eec2ce99b1434d00c6d64a874f119 (diff) | |
| download | tde-packaging-b4b507c636506960fb306de332ec30be399758dc.tar.gz tde-packaging-b4b507c636506960fb306de332ec30be399758dc.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat')
37 files changed, 356 insertions, 1180 deletions
diff --git a/redhat/Makefile.v3.5.13-sru b/redhat/Makefile.v3.5.13-sru index ecce67864..276dda8bd 100644 --- a/redhat/Makefile.v3.5.13-sru +++ b/redhat/Makefile.v3.5.13-sru @@ -85,7 +85,7 @@ tdegames: tdebase tdemultimedia tdegraphics: tdebase poppler cmake $(call buildpkg,tdegraphics) -tdelibs: tqt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake +tdelibs: qt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake $(call buildpkg,tdelibs) tdemultimedia: tdebase akode diff --git a/redhat/applications/adept/adept-14.0.0.spec b/redhat/applications/adept/adept-14.0.0.spec index b271314ce..2ba208ff8 100644 --- a/redhat/applications/adept/adept-14.0.0.spec +++ b/redhat/applications/adept/adept-14.0.0.spec @@ -168,7 +168,7 @@ export PATH="%{tde_bindir}:${PATH}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ \ - --disable-rpath \ + --enable-rpath \ --enable-closure \ \ --with-extra-includes=%{_includedir}/tqt3 \ diff --git a/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec b/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec new file mode 100644 index 000000000..afb74de02 --- /dev/null +++ b/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec @@ -0,0 +1,109 @@ +# Default version for this component +%define tde_pkg fusion-icon +%define tde_version 14.0.0 + +%if "%{?python2_sitelib}" == "" +%define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") +%endif + + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif + +# TDE specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man + +%define _docdir %{tde_docdir} + + +Name: trinity-%{tde_pkg} +Summary: tray icon to launch and manage Compiz Fusion [Trinity] +Version: 0.0.0+git20071028 +Release: 2%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot <[email protected]> +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: python +Requires: python +Requires: trinity-compizconfig-backend-kconfig + +%description +The OpenCompositing Project brings 3D desktop visual effects that +improve the usability and eye candy of the X Window System and provide +increased productivity. + +This package contains a tray icon that can launch Compiz and its +decorators. + + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + + +%build +unset QTDIR QTINC QTLIB +export PATH="%{tde_bindir}:${PATH}" + +%__make + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install \ + DESTDIR=%{buildroot} \ + PREFIX=%{tde_prefix} + +# Removes 'egg-info' +find "%{?buildroot}%{python2_sitelib}" -name "*.egg-info" -delete + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : + +%postun +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : + + +%files +%defattr(-,root,root,-) +%{tde_bindir}/fusion-icon +%{python2_sitelib}/FusionIcon/ +%{tde_datadir}/applications/fusion-icon.desktop +%{tde_datadir}/icons/hicolor/*/apps/fusion-icon.png +%{tde_datadir}/icons/hicolor/scalable/apps/fusion-icon.svg + + +%Changelog +* Sat Aug 04 2012 Francois Andriot <[email protected]> - 0.0.0+git20071028-2 +- Fix python module installation + +* Sat Nov 19 2011 Francois Andriot <[email protected]> - 0.0.0+git20071028-1 +- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/fusion-icon/fusion-icon.spec b/redhat/applications/fusion-icon/fusion-icon.spec index 6580ca75b..729590bfe 100644 --- a/redhat/applications/fusion-icon/fusion-icon.spec +++ b/redhat/applications/fusion-icon/fusion-icon.spec @@ -1,5 +1,6 @@ # Default version for this component -%define kdecomp fusion-icon +%define tde_pkg fusion-icon +%define tde_version 14.0.0 %if "%{?python2_sitelib}" == "" %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") @@ -11,7 +12,7 @@ %define _variant .opt %endif -# TDE 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -27,7 +28,7 @@ %define _docdir %{tde_docdir} -Name: trinity-%{kdecomp} +Name: trinity-%{tde_pkg} Summary: tray icon to launch and manage Compiz Fusion [Trinity] Version: 0.0.0+git20071028 Release: 2%{?dist}%{?_variant} @@ -42,7 +43,7 @@ URL: http://www.trinitydesktop.org/ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{kdecomp}-3.5.13.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz # [fusion-icon] Allow python installation under /usr instead of tde_prefix Patch1: fusion-icon-3.5.13-fix_python_sitelib.patch @@ -65,12 +66,12 @@ decorators. %prep -%setup -q -n applications/%{kdecomp} -%patch1 -p1 +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %build -unset QTDIR || : ; . /etc/profile.d/qt.sh +unset QTDIR QTINC QTLIB +. /etc/profile.d/qt.sh export PATH="%{tde_bindir}:${PATH}" export LDFLAGS="-L%{_libdir} -I%{_includedir}" diff --git a/redhat/applications/kbarcode/kbarcode-14.0.0.spec b/redhat/applications/kbarcode/kbarcode-14.0.0.spec index 064a1402a..5f122bd1a 100644 --- a/redhat/applications/kbarcode/kbarcode-14.0.0.spec +++ b/redhat/applications/kbarcode/kbarcode-14.0.0.spec @@ -23,11 +23,12 @@ %define _docdir %{tde_docdir} +########## Name: trinity-%{tde_pkg} Summary: barcode and label printing application for Trinity -Version: 2.0.6 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Version: 2.0.7 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -50,6 +51,8 @@ BuildRequires: desktop-file-utils BuildRequires: gettext +Requires: %{name}-tdefile-plugin = %{version}-%{release} + %description KBarcode is a barcode and label printing application for Trinity. It can be used @@ -70,11 +73,57 @@ supported. Even complex 2D barcodes are supported using third party tools. The generated barcodes can be directly printed or you can export them into images to use them in another application. +%post +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : +update-desktop-database %{tde_appdir} &> /dev/null + +%postun +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : +update-desktop-database %{tde_appdir} &> /dev/null + +%files -f %{tde_pkg}.lang +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README TODO +%{tde_bindir}/kbarcode +%{tde_tdeappdir}/kbarcode-batch.desktop +%{tde_tdeappdir}/kbarcode-editor.desktop +%{tde_tdeappdir}/kbarcode-single.desktop +%{tde_tdeappdir}/kbarcode.desktop +%{tde_datadir}/mimelnk/application/kbarcode-label.desktop +%{tde_datadir}/apps/kbarcode/ +%{tde_datadir}/icons/hicolor/*/actions/barcode.png +%{tde_datadir}/icons/hicolor/*/actions/kbarcodeellipse.png +%{tde_datadir}/icons/hicolor/*/actions/kbarcodegrid.png +%{tde_datadir}/icons/hicolor/*/actions/kbarcodelinetool.png +%{tde_datadir}/icons/hicolor/*/actions/kbarcoderect.png +%{tde_datadir}/icons/hicolor/*/apps/kbarcode.png +%{tde_tdedocdir}/HTML/en/kbarcode/ + +########## + +%package tdefile-plugin +Summary: tdefile-plugin for %{name} +Group: Applications/Utilities +#Requires: %{name} = %{version}-%{release} + +%description tdefile-plugin +%{summary}. + +%files tdefile-plugin +%defattr(-,root,root,-) +%{tde_tdelibdir}/tdefile_kbarcode.la +%{tde_tdelibdir}/tdefile_kbarcode.so +%{tde_datadir}/services/tdefile_kbarcode.desktop + +########## %if 0%{?suse_version} || 0%{?pclinuxos} %debug_package %endif +########## %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} @@ -87,7 +136,6 @@ to use them in another application. %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -125,39 +173,6 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -update-desktop-database %{tde_appdir} &> /dev/null - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -update-desktop-database %{tde_appdir} &> /dev/null - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_bindir}/kbarcode -%{tde_tdelibdir}/tdefile_kbarcode.la -%{tde_tdelibdir}/tdefile_kbarcode.so -%{tde_tdeappdir}/kbarcode-batch.desktop -%{tde_tdeappdir}/kbarcode-editor.desktop -%{tde_tdeappdir}/kbarcode-single.desktop -%{tde_tdeappdir}/kbarcode.desktop -%{tde_datadir}/mimelnk/application/kbarcode-label.desktop -%{tde_datadir}/apps/kbarcode/ -%{tde_datadir}/icons/hicolor/*/actions/barcode.png -%{tde_datadir}/icons/hicolor/*/actions/kbarcodeellipse.png -%{tde_datadir}/icons/hicolor/*/actions/kbarcodegrid.png -%{tde_datadir}/icons/hicolor/*/actions/kbarcodelinetool.png -%{tde_datadir}/icons/hicolor/*/actions/kbarcoderect.png -%{tde_datadir}/icons/hicolor/*/apps/kbarcode.png -%{tde_datadir}/services/tdefile_kbarcode.desktop -%{tde_tdedocdir}/HTML/en/kbarcode/ - - %changelog * Fri Jul 05 2013 Francois Andriot <[email protected]> - 2.0.6-5 - Initial release for TDE 14.0.0 diff --git a/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec b/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec index 3ec4289db..2220b3cc1 100644 --- a/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec +++ b/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec @@ -553,7 +553,6 @@ Provides: %{name}-tz_TW = %{version}-%{release} %build export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export kde_htmldir="%{tde_tdedocdir}/HTML" diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec index a18b76755..a1c97922e 100644 --- a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec +++ b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec @@ -176,7 +176,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_datadir}/services/tdenetman_pptp.desktop %{tde_datadir}/services/tdenetman_strongswan.desktop %{tde_datadir}/services/tdenetman_vpnc.desktop - +%{tde_tdedocdir}/HTML/en/tdenetworkmanager/ %files devel %defattr(-,root,root,-) diff --git a/redhat/extras/jpegint.h.el5 b/redhat/build/jpegint.h.el5 index 95b00d405..95b00d405 100644 --- a/redhat/extras/jpegint.h.el5 +++ b/redhat/build/jpegint.h.el5 diff --git a/redhat/extras/jpegint.h.el6 b/redhat/build/jpegint.h.el6 index 78717482e..78717482e 100644 --- a/redhat/extras/jpegint.h.el6 +++ b/redhat/build/jpegint.h.el6 diff --git a/redhat/dependencies/tqca-tls/qca-tls-1.0-mach.patch b/redhat/dependencies/tqca-tls/qca-tls-1.0-mach.patch deleted file mode 100644 index 9bac68b83..000000000 --- a/redhat/dependencies/tqca-tls/qca-tls-1.0-mach.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ./qca-tls.pro.mach 2004-06-10 11:55:22.411187448 +0200 -+++ ./qca-tls.pro 2004-06-10 11:55:43.460987392 +0200 -@@ -2,6 +2,7 @@ - - TEMPLATE = lib - CONFIG += qt thread release plugin -+CONFIG += no_fixpath - TARGET = qca-tls - - !exists(qcaprovider.h) { diff --git a/redhat/dependencies/tqca-tls/qca-tls-1.0-ossl098.patch b/redhat/dependencies/tqca-tls/qca-tls-1.0-ossl098.patch deleted file mode 100644 index edfb376e0..000000000 --- a/redhat/dependencies/tqca-tls/qca-tls-1.0-ossl098.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- ./qca-tls.cpp.ossl098 2003-12-10 17:53:57.000000000 +0100 -+++ ./qca-tls.cpp 2005-11-13 22:21:50.000000000 +0100 -@@ -454,7 +454,11 @@ - if(!r) { - // try this other public function, for whatever reason - p = (void *)in; -+#ifdef OSSL_097 -+ r = d2i_RSA_PUBKEY(NULL, (const unsigned char **)&p, len); -+#else - r = d2i_RSA_PUBKEY(NULL, (unsigned char **)&p, len); -+#endif - } - if(r) { - if(pub) { -@@ -798,7 +802,11 @@ - - bool createFromDER(const char *in, unsigned int len) - { -+#ifdef OSSL_097 -+ const unsigned char *p = (const unsigned char *)in; -+#else - unsigned char *p = (unsigned char *)in; -+#endif - X509 *t = d2i_X509(NULL, &p, len); - if(!t) - return false; diff --git a/redhat/dependencies/tqca-tls/qca-tls-1.0-ossl10.patch b/redhat/dependencies/tqca-tls/qca-tls-1.0-ossl10.patch deleted file mode 100644 index 7b2406f61..000000000 --- a/redhat/dependencies/tqca-tls/qca-tls-1.0-ossl10.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up qca-tls-1.0/qca-tls.cpp.ossl10 qca-tls-1.0/qca-tls.cpp ---- qca-tls-1.0/qca-tls.cpp.ossl10 2009-08-26 10:08:36.000000000 +0200 -+++ qca-tls-1.0/qca-tls.cpp 2009-08-26 10:11:57.000000000 +0200 -@@ -953,7 +953,11 @@ public: - RSAKeyContext *key; - - SSL *ssl; -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ const SSL_METHOD *method; -+#else - SSL_METHOD *method; -+#endif - SSL_CTX *context; - BIO *rbio, *wbio; - CertContext cc; diff --git a/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec b/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec index c186c9c70..1bfb9bdce 100644 --- a/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec +++ b/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec @@ -28,14 +28,7 @@ Packager: Francois Andriot <[email protected]> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: tqca-tls-master.tar.gz - -# Fix build in mach for QT apps -Patch0: qca-tls-1.0-mach.patch -# Build with openssl 1.0.0 -Patch2: qca-tls-1.0-ossl10.patch -# Allows building with TQT3 from TDE -Patch10: tqca-tls-qt3.patch +Source0: tqca-tls-3.5.13.2.tar.gz BuildRequires: qt3-devel >= 3.3.8.d BuildRequires: trinity-tqtinterface-devel >= %{tde_version} @@ -58,17 +51,12 @@ contains the TLS plugin. ########## %prep -%setup -q -n tqca-tls-master -%patch0 -p0 -b .mach -%patch2 -p1 -b .ossl10 -%patch10 -p1 -b .qt - -# Revert TQCA to QCA -%__sed -i * -e "s|TQCA|QCA|g" +%setup -q -n tqca-tls-3.5.13.2 %build -unset QTDIR || : ; . /etc/profile.d/qt3.sh +unset QTDIR QTINC QTLIB +. /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" diff --git a/redhat/dependencies/tqca-tls/tqca-tls-qt3.patch b/redhat/dependencies/tqca-tls/tqca-tls-qt3.patch deleted file mode 100644 index 29f1f207c..000000000 --- a/redhat/dependencies/tqca-tls/tqca-tls-qt3.patch +++ /dev/null @@ -1,105 +0,0 @@ ---- tqca-tls-master/configure.qt 2012-06-20 03:30:48.000000000 +0200 -+++ tqca-tls-master/configure 2013-05-28 20:30:52.827808679 +0200 -@@ -60,7 +60,7 @@ - if [ "$QC_DEBUG" = "Y" ]; then - echo \$QTDIR not set... trying to find Qt manually - fi -- for p in /usr/lib/tqt /usr/share/tqt /usr/share/tqt3 /usr/local/lib/tqt /usr/local/share/tqt /usr/lib/tqt3 /usr/local/lib/tqt3 /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/lib64/tqt /usr/local/lib64/tqt /usr/lib64/tqt3 /usr/local/lib64/tqt3 /usr/lib64/qt /usr/local/lib64/qt /usr/lib64/qt3 /usr/local/lib64/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do -+ for p in /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/lib64/qt /usr/local/lib64/qt /usr/lib64/qt3 /usr/local/lib64/qt3 /usr/lib64/qt /usr/local/lib64/qt /usr/lib64/qt3 /usr/local/lib64/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do - if [ -d "$p/mkspecs" ]; then - QTDIR=$p - break; -@@ -79,15 +79,15 @@ - fi - fi - --if [ ! -x "$QTDIR/bin/tqmake" ]; then -+if [ ! -x "$QTDIR/bin/qmake" ]; then - if [ "$QC_DEBUG" = "Y" ]; then -- echo Warning: tqmake not in \$QTDIR/bin/tqmake -+ echo Warning: qmake not in \$QTDIR/bin/qmake - echo trying to find it in \$PATH - fi -- qm=`type -p tqmake` -+ qm=`type -p qmake` - if [ -x "$qm" ]; then - if [ "$QC_DEBUG" = "Y" ]; then -- echo tqmake found in $qm -+ echo qmake found in $qm - fi - else - echo fail -@@ -96,12 +96,12 @@ - echo or I missdetected \$QTDIR=$QTDIR - echo - echo Please set \$QTDIR manually and make sure that -- echo \$QTDIR/bin/tqmake exists. -+ echo \$QTDIR/bin/qmake exists. - echo - exit 1; - fi - else -- qm=$QTDIR/bin/tqmake -+ qm=$QTDIR/bin/qmake - fi - - gen_files() { -@@ -184,7 +184,9 @@ - conf->addLib("-lssl -lcrypto"); - - // Make sure tqtinterface can be found -- conf->addIncludePath("/usr/include/tqt"); -+ conf->addIncludePath("/usr/include/tqt"); -+ // Make sure tqt3 can be found -+ conf->addIncludePath("${QTINC:-${QTDIR}/include}"); - - return true; - } -@@ -476,7 +478,7 @@ - - TQString str; - str += "# qconf\n"; -- str += "QT_PATH_PLUGINS = " + TQString(tqInstallPathPlugins()) + '\n'; -+ str += "QT_PATH_PLUGINS = " + TQString(qInstallPathPlugins()) + '\n'; - if(!conf->DEFINES.isEmpty()) - str += "DEFINES += " + conf->DEFINES + '\n'; - if(!conf->INCLUDEPATH.isEmpty()) -@@ -511,7 +513,7 @@ - TEMPLATE = app - CONFIG += qt x11 thread console - TARGET = conf --INCLUDEPATH += '/usr/include/tqt' -+INCLUDEPATH += '/usr/include/tqt' '${QTINC:-${QTDIR}/include}' - - DEFINES += X11_INC='"\$\$QMAKE_INCDIR_X11"' - DEFINES += X11_LIBDIR='"\$\$QMAKE_LIBDIR_X11"' -@@ -537,16 +539,16 @@ - ) - - if [ "$?" != "0" ]; then -- rm -rf .qconftemp -+# rm -rf .qconftemp - echo fail - echo - echo "There was an error compiling 'conf'. Be sure you have a proper" - echo "TQt 3.x Multithreaded (MT) build environment set up." -- if [ ! -f "$QTDIR/lib/libtqt-mt.so.3" ]; then -- if [ ! -f "$QTDIR/lib64/libtqt-mt.so.3" ]; then -+ if [ ! -f "${QTLIB:-${QTDIR}/lib}/libqt-mt.so.3" ]; then -+ if [ ! -f "${QTLIB:-${QTDIR}/lib64}/libqt-mt.so.3" ]; then - echo - echo "One possible reason is that you don't have" -- echo "libtqt-mt.so.3 installed in $QTDIR/lib/" -+ echo "libqt-mt.so.3 installed in $QTDIR/lib/" - echo "or $QTDIR/lib64/." - fi - fi -@@ -575,7 +577,7 @@ - if [ -x "./qcextra" ]; then - ./qcextra - fi --# run tqmake -+# run qmake - if expr match "$DEB_BUILD_OPTIONS" ".*nostrip"; then - $qm QMAKE_STRIP=true qca-tls.pro - else diff --git a/redhat/dependencies/tqca/qca-1.0-mach.patch b/redhat/dependencies/tqca/qca-1.0-mach.patch deleted file mode 100644 index c20b0cb13..000000000 --- a/redhat/dependencies/tqca/qca-1.0-mach.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ./qca.pro.mach 2004-11-22 11:15:24.061984966 +0100 -+++ ./qca.pro 2004-11-22 11:15:31.483010203 +0100 -@@ -2,6 +2,7 @@ - - TEMPLATE = lib - CONFIG += qt thread release -+CONFIG += no_fixpath - TARGET = qca - - MOC_DIR = .moc diff --git a/redhat/dependencies/tqca/tqca-1.0-fix_qt3_detection.patch b/redhat/dependencies/tqca/tqca-1.0-fix_qt3_detection.patch deleted file mode 100644 index f608bc6c8..000000000 --- a/redhat/dependencies/tqca/tqca-1.0-fix_qt3_detection.patch +++ /dev/null @@ -1,132 +0,0 @@ ---- tqca.ORI/qca.pro 2012-04-24 17:24:02.760426575 -0400 -+++ tqca.P/qca.pro 2012-04-24 17:39:36.323825994 -0400 -@@ -21,6 +21,7 @@ - QCA_CPP = src - INCLUDEPATH += $$QCA_CPP - INCLUDEPATH += /usr/include/tqt -+INCLUDEPATH += /opt/trinity/include/tqt - - HEADERS += \ - $$QCA_CPP/qca.h \ ---- tqca-master/configure.qt 2012-06-20 03:30:19.000000000 +0200 -+++ tqca-master/configure 2013-05-28 19:44:10.821100155 +0200 -@@ -8,7 +8,7 @@ - - Main options: - --prefix=[path] Base path for build/install. Default: /usr/local -- --qtdir=[path] Directory where Qt is installed. -+ --qtdir=[path] Directory where [T]Qt is installed. - --help This help text. - - EOT -@@ -37,7 +37,7 @@ - - PREFIX=${PREFIX:-/usr/local} - --echo "Configuring TQt Cryptographic Architecture (QCA) ..." -+echo "Configuring TQt Cryptographic Architecture (TQCA) ..." - - if [ "$QC_DEBUG" = "Y" ]; then - echo -@@ -52,7 +52,7 @@ - if [ "$QC_DEBUG" = "Y" ]; then - echo \$QTDIR not set... trying to find Qt manually - fi -- for p in /usr/lib/tqt /usr/share/tqt /usr/share/tqt3 /usr/local/lib/tqt /usr/local/share/tqt /usr/lib/tqt3 /usr/local/lib/tqt3 /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/lib64/tqt /usr/local/lib64/tqt /usr/lib64/tqt3 /usr/local/lib64/tqt3 /usr/lib64/qt /usr/local/lib64/qt /usr/lib64/qt3 /usr/local/lib64/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do -+ for p in /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/lib64/qt /usr/local/lib64/qt /usr/lib64/qt3 /usr/local/lib64/qt3 /usr/lib64/qt /usr/local/lib64/qt /usr/lib64/qt3 /usr/local/lib64/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do - if [ -d "$p/mkspecs" ]; then - QTDIR=$p - break; -@@ -62,7 +62,7 @@ - echo fail - echo - echo Unable to find Qt 'mkspecs'. Please set QTDIR -- echo manually. Perhaps you need to install Qt 3 -+ echo manually. Perhaps you need to install [T]Qt 3 - echo development utilities. You may download them either - echo from the vendor of your operating system or from - echo www.trolltech.com -@@ -71,15 +71,15 @@ - fi - fi - --if [ ! -x "$QTDIR/bin/tqmake" ]; then -+if [ ! -x "$QTDIR/bin/qmake" ]; then - if [ "$QC_DEBUG" = "Y" ]; then -- echo Warning: tqmake not in \$QTDIR/bin/tqmake -+ echo Warning: qmake not in \$QTDIR/bin/qmake - echo trying to find it in \$PATH - fi -- qm=`type -p tqmake` -+ qm=`type -p qmake` - if [ -x "$qm" ]; then - if [ "$QC_DEBUG" = "Y" ]; then -- echo tqmake found in $qm -+ echo qmake found in $qm - fi - else - echo fail -@@ -88,12 +88,12 @@ - echo or I missdetected \$QTDIR=$QTDIR - echo - echo Please set \$QTDIR manually and make sure that -- echo \$QTDIR/bin/tqmake exists. -+ echo \$QTDIR/bin/qmake exists. - echo - exit 1; - fi - else -- qm=$QTDIR/bin/tqmake -+ qm=$QTDIR/bin/qmake - fi - - gen_files() { -@@ -382,7 +382,7 @@ - - TQString str; - str += "# qconf\n"; -- str += "QT_PATH_PLUGINS = " + TQString(tqInstallPathPlugins()) + '\n'; -+ str += "QT_PATH_PLUGINS = " + TQString(qInstallPathPlugins()) + '\n'; - if(!conf->DEFINES.isEmpty()) - str += "DEFINES += " + conf->DEFINES + '\n'; - if(!conf->INCLUDEPATH.isEmpty()) -@@ -417,7 +417,8 @@ - TEMPLATE = app - CONFIG += qt x11 thread console - TARGET = conf --INCLUDEPATH += '/usr/include/tqt' -+INCLUDEPATH += '${QTINC:-${QTDIR}/include}' -+INCLUDEPATH += '/usr/include/tqt' - - DEFINES += X11_INC='"\$\$QMAKE_INCDIR_X11"' - DEFINES += X11_LIBDIR='"\$\$QMAKE_LIBDIR_X11"' -@@ -442,16 +443,16 @@ - ) - - if [ "$?" != "0" ]; then -- rm -rf .qconftemp -+# rm -rf .qconftemp - echo fail - echo - echo "There was an error compiling 'conf'. Be sure you have a proper" - echo "TQt 3.x Multithreaded (MT) build environment set up." -- if [ ! -f "$QTDIR/lib/libtqt-mt.so.3" ]; then -- if [ ! -f "$QTDIR/lib64/libtqt-mt.so.3" ]; then -+ if [ ! -f "$QTDIR/lib/libqt-mt.so.3" ]; then -+ if [ ! -f "$QTDIR/lib64/libqt-mt.so.3" ]; then - echo - echo "One possible reason is that you don't have" -- echo "libtqt-mt.so.3 installed in $QTDIR/lib/" -+ echo "libqt-mt.so.3 installed in $QTDIR/lib/" - echo "or $QTDIR/lib64/." - fi - fi -@@ -480,7 +481,7 @@ - if [ -x "./qcextra" ]; then - ./qcextra - fi --# run tqmake -+# run qmake - $qm qca.pro - if [ "$?" != "0" ]; then - echo diff --git a/redhat/dependencies/tqca/tqca-3.5.13.2.spec b/redhat/dependencies/tqca/tqca-3.5.13.2.spec index ac4b88cca..ba8acba8a 100644 --- a/redhat/dependencies/tqca/tqca-3.5.13.2.spec +++ b/redhat/dependencies/tqca/tqca-3.5.13.2.spec @@ -32,10 +32,7 @@ Packager: Francois Andriot <[email protected]> Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: tqca-master.tar.gz - -Patch0: qca-1.0-mach.patch -Patch1: tqca-1.0-fix_qt3_detection.patch +Source0: tqca-3.5.13.2.tar.gz BuildRequires: qt3-devel >= 3.3.8.d BuildRequires: trinity-tqtinterface-devel >= %{tde_version} @@ -91,19 +88,15 @@ This packages contains the development files for TQCA ########## %prep -%setup -q -n tqca-master -%patch0 -p0 -b .mach -%patch1 -p1 -b .qt +%setup -q -n tqca-3.5.13.2 # Fix 'lib64' library directory perl -pi -e 's,target\.path=\$PREFIX/lib,target.path=\$PREFIX/%{_lib},g' qcextra -# Revert TQCA to QCA -%__sed -i examples/*/*.cpp src/*.h src/*.cpp -e "s|TQCA|QCA|g" - %build -unset QTDIR || : ; . /etc/profile.d/qt3.sh +unset QTDIR QTINC QTLIB +. /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec index 28ddd68b9..603f70ebc 100755 --- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec @@ -135,8 +135,8 @@ fi -DWITH_GCC_VISIBILITY=OFF \ \ -DQTDIR="%{tde_datadir}/tqt3" \ - -DQT_INCLUDE_DIRS="%{tde_includedir}/tqt3" \ - -DQT_LIBRARY_DIRS="%{tde_libdir}" \ + -DQT_INCLUDE_DIR="%{tde_includedir}/tqt3" \ + -DQT_LIBRARY_DIR="%{tde_libdir}" \ \ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \ diff --git a/redhat/extras/akode/akode-14.0.0-ftbfs.patch b/redhat/extras/akode/akode-14.0.0-ftbfs.patch deleted file mode 100644 index df4fe0981..000000000 --- a/redhat/extras/akode/akode-14.0.0-ftbfs.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- akode-2.0.2/configure.in.in.ORI 2013-08-10 11:51:41.617074169 +0200 -+++ akode-2.0.2/configure.in.in 2013-08-10 11:51:49.295565706 +0200 -@@ -55,7 +55,7 @@ - - dnl without this order in this file, automake will be confused! - dnl --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADER(config.h) - - dnl checks for programs. - dnl first check for c/c++ compilers ---- akode-2.0.2/akode/configure.in.in.ORI 2013-08-10 11:53:11.355740687 +0200 -+++ akode-2.0.2/akode/configure.in.in 2013-08-10 11:53:18.498367142 +0200 -@@ -2,7 +2,7 @@ - dnl AC_OUTPUT(akode/akode-config) - dnl AC_OUTPUT(akode/akode.pc) - --AM_CONFIG_HEADER(akode/lib/akode_export.h) -+AC_CONFIG_HEADER(akode/lib/akode_export.h) - - AC_DEFUN([AC_CHECK_LIBFLAC], - [ diff --git a/redhat/extras/akode/akode-14.0.0.spec b/redhat/extras/akode/akode-14.0.0.spec index d86574a30..18c1cfa60 100644 --- a/redhat/extras/akode/akode-14.0.0.spec +++ b/redhat/extras/akode/akode-14.0.0.spec @@ -28,25 +28,12 @@ Group: System Environment/Libraries #URL: http://carewolf.com/akode/ URL: http://www.kde-apps.org/content/show.php?content=30375 -Source0: akode-2.0.2.tar.bz2 -Source1: admin-14.0.0.tar.gz +Source0: akode-14.0.0.tar.gz Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# Legacy Fedora 9 patches -Patch1: akode-pulseaudio.patch -Patch2: akode-2.0.2-multilib.patch -Patch3: akode-2.0.2-flac113-portable.patch -Patch4: akode-2.0.2-gcc43.patch - -# New patches -Patch10: akode-autotools.patch -Patch11: akode-2.0.2-fix_ffmpeg_include.patch -Patch12: akode-2.0.2-fix_ftbfs.patch -Patch13: akode-14.0.0-ftbfs.patch - # FLAC support %define _with_flac --with-flac %if 0%{?mgaversion} || 0%{?mdkversion} @@ -284,21 +271,7 @@ Requires: %{name} = %{version}-%{release} ########## %prep -%setup -q -n akode-%{version} -%__rm -rf admin -tar xfz %{SOURCE1} - -%patch1 -p1 -b .pulseaudio -%patch2 -p1 -b .multilib -%patch3 -p4 -b .flac113_portable -%patch4 -p1 -b .gcc43 - -#patch10 -p1 -b .autotools -%patch11 -p1 -b .ffmpeg -%patch12 -p1 -b .ftbfs -%patch13 -p1 -b .ftbfs - -%__rm -f libtool acinclude.m4 configure.in Makefile.cvs aclocal.m4 +%setup -q -n akode-2.0.2 %__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" diff --git a/redhat/extras/akode/akode-2.0.2-fix_ffmpeg_include.patch b/redhat/extras/akode/akode-2.0.2-fix_ffmpeg_include.patch deleted file mode 100644 index d16411ed7..000000000 --- a/redhat/extras/akode/akode-2.0.2-fix_ffmpeg_include.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp.ORI 2012-08-04 22:36:12.435734576 +0200 -+++ a/akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp 2012-08-04 22:37:20.153030459 +0200 -@@ -26,9 +26,9 @@ - #include "decoder.h" - - #include <assert.h> --#include <ffmpeg/avcodec.h> --#include <ffmpeg/avformat.h> --#include <ffmpeg/avio.h> -+#include <libavcodec/avcodec.h> -+#include <libavformat/avformat.h> -+#include <libavformat/avio.h> - - #include "ffmpeg_decoder.h" - #include <iostream> diff --git a/redhat/extras/akode/akode-2.0.2-fix_ftbfs.patch b/redhat/extras/akode/akode-2.0.2-fix_ftbfs.patch deleted file mode 100644 index 96aa0f38f..000000000 --- a/redhat/extras/akode/akode-2.0.2-fix_ftbfs.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ./akode/lib/akodelib.h.ORI 2013-07-25 11:49:19.524457787 +0200 -+++ ./akode/lib/akodelib.h 2013-07-25 11:49:23.056360414 +0200 -@@ -34,13 +34,13 @@ - #include <inttypes.h> - #else - typedef signed char int8_t; --typedef unsigned char int8_t; -+typedef unsigned char uint8_t; - typedef signed short int16_t; --typedef unsigned short int16_t; -+typedef unsigned short uint16_t; - typedef signed int int32_t; - typedef unsigned int uint32_t; --typedef signed long long int64_t; --typedef unsigned long long uint64_t; -+typedef signed long int64_t; -+typedef unsigned long uint64_t; - #endif - - #endif diff --git a/redhat/extras/akode/akode-2.0.2-flac113-portable.patch b/redhat/extras/akode/akode-2.0.2-flac113-portable.patch deleted file mode 100644 index 4c5a26119..000000000 --- a/redhat/extras/akode/akode-2.0.2-flac113-portable.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- branches/kdesupport/3.5/kdesupport/akode/plugins/xiph_decoder/flac113_decoder.cpp 2007/04/14 22:11:43 654042 -+++ branches/kdesupport/3.5/kdesupport/akode/plugins/xiph_decoder/flac113_decoder.cpp 2007/04/14 22:14:06 654043 -@@ -108,7 +108,7 @@ - static FLAC__StreamDecoderReadStatus flac_read_callback( - const FLAC__StreamDecoder *, - FLAC__byte buffer[], -- unsigned *bytes, -+ size_t *bytes, - void *client_data) - { - FLACDecoder::private_data *data = (FLACDecoder::private_data*)client_data; diff --git a/redhat/extras/akode/akode-2.0.2-gcc43.patch b/redhat/extras/akode/akode-2.0.2-gcc43.patch deleted file mode 100644 index b4491eb3e..000000000 --- a/redhat/extras/akode/akode-2.0.2-gcc43.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -up akode-2.0.2/akode/akodeplay/akodeplay.cpp.gcc43 akode-2.0.2/akode/akodeplay/akodeplay.cpp ---- akode-2.0.2/akode/akodeplay/akodeplay.cpp.gcc43 2006-11-06 07:20:52.000000000 -0600 -+++ akode-2.0.2/akode/akodeplay/akodeplay.cpp 2008-02-12 17:28:00.000000000 -0600 -@@ -25,6 +25,7 @@ - #include "../lib/sink.h" - #include "../lib/decoder.h" - -+#include <stdlib.h> - #ifdef HAVE_GNU_GETOPT - #include <getopt.h> - #else -diff -up akode-2.0.2/akode/lib/player.cpp.gcc43 akode-2.0.2/akode/lib/player.cpp ---- akode-2.0.2/akode/lib/player.cpp.gcc43 2006-11-05 08:37:48.000000000 -0600 -+++ akode-2.0.2/akode/lib/player.cpp 2008-02-12 17:10:58.000000000 -0600 -@@ -21,6 +21,7 @@ - #include <pthread.h> - #include <semaphore.h> - #include <assert.h> -+#include <string.h> - - #include "audioframe.h" - #include "audiobuffer.h" -diff -up akode-2.0.2/akode/lib/magic.cpp.gcc43 akode-2.0.2/akode/lib/magic.cpp ---- akode-2.0.2/akode/lib/magic.cpp.gcc43 2008-02-12 16:52:26.000000000 -0600 -+++ akode-2.0.2/akode/lib/magic.cpp 2008-02-12 17:16:54.000000000 -0600 -@@ -21,6 +21,8 @@ - #include "akodelib.h" - #include "magic.h" - #include "file.h" -+#include <stdlib.h> -+#include <string.h> - #include <iostream> - using std::cerr; - -diff -up akode-2.0.2/akode/lib/akode_export.h.in.gcc43 akode-2.0.2/akode/lib/akode_export.h.in -diff -up akode-2.0.2/akode/lib/auto_sink.cpp.gcc43 akode-2.0.2/akode/lib/auto_sink.cpp ---- akode-2.0.2/akode/lib/auto_sink.cpp.gcc43 2005-10-26 08:50:29.000000000 -0500 -+++ akode-2.0.2/akode/lib/auto_sink.cpp 2008-02-12 16:57:18.000000000 -0600 -@@ -21,6 +21,7 @@ - #include "audioframe.h" - #include "auto_sink.h" - -+#include <stdlib.h> - #include <iostream> - - namespace aKode { diff --git a/redhat/extras/akode/akode-2.0.2-multilib.patch b/redhat/extras/akode/akode-2.0.2-multilib.patch deleted file mode 100644 index c3832a960..000000000 --- a/redhat/extras/akode/akode-2.0.2-multilib.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -up /dev/null akode-2.0.2/akode/akode.pc.in ---- /dev/null 2007-12-13 13:41:14.965729569 -0600 -+++ akode-2.0.2/akode/akode.pc.in 2007-12-23 21:32:59.000000000 -0600 -@@ -0,0 +1,11 @@ -+prefix=@prefix@ -+exec_prefix=@prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: akode -+Description: aKode is a simple audio-decoding frame-work -+Version: 2.0.2 -+Libs: -L${libdir} -lakode -+Cflags: -I${includedir} -+ -diff -up akode-2.0.2/akode/configure.in.in.multilib akode-2.0.2/akode/configure.in.in ---- akode-2.0.2/akode/configure.in.in.multilib 2007-12-23 21:32:59.000000000 -0600 -+++ akode-2.0.2/akode/configure.in.in 2007-12-23 21:32:59.000000000 -0600 -@@ -1,5 +1,6 @@ - dnl don't remove the below - dnl AC_OUTPUT(akode/akode-config) -+dnl AC_OUTPUT(akode/akode.pc) - - AM_CONFIG_HEADER(akode/lib/akode_export.h) - -diff -up akode-2.0.2/akode/akode-config.in.multilib akode-2.0.2/akode/akode-config.in ---- akode-2.0.2/akode/akode-config.in.multilib 2007-04-06 08:16:47.000000000 -0500 -+++ akode-2.0.2/akode/akode-config.in 2007-12-23 21:37:40.000000000 -0600 -@@ -15,9 +15,8 @@ EOH - } - - prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@ -+akode_libs="`pkg-config --libs akode`" -+akode_cflags="`pkg-config --cflags akode`" - - flags="" - -@@ -29,10 +28,10 @@ while test $# -gt 0 - do - case $1 in - --libs) -- flags="$flags -L$libdir -lakode" -+ flags="$flags $akode_libs" - ;; - --cflags) -- flags="$flags -I$includedir" -+ flags="$flags $akode_cflags" - ;; - --version) - echo 2.0.2 -diff -up akode-2.0.2/akode/Makefile.am.multilib akode-2.0.2/akode/Makefile.am ---- akode-2.0.2/akode/Makefile.am.multilib 2005-07-14 09:27:18.000000000 -0500 -+++ akode-2.0.2/akode/Makefile.am 2007-12-23 21:32:59.000000000 -0600 -@@ -1,3 +1,8 @@ - bin_SCRIPTS = akode-config - - SUBDIRS= lib plugins akodeplay -+ -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = akode.pc -+ -+EXTRA_DIST = akode.pc.in diff --git a/redhat/extras/akode/akode-2.0.2.tar.bz2 b/redhat/extras/akode/akode-2.0.2.tar.bz2 Binary files differdeleted file mode 100644 index 3947de626..000000000 --- a/redhat/extras/akode/akode-2.0.2.tar.bz2 +++ /dev/null diff --git a/redhat/extras/akode/akode-autotools.patch b/redhat/extras/akode/akode-autotools.patch deleted file mode 100644 index d08ac3446..000000000 --- a/redhat/extras/akode/akode-autotools.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- akode-2.0.2/akode/lib/Makefile.am.ORI 2012-01-16 19:17:09.849211160 +0100 -+++ akode-2.0.2/akode/lib/Makefile.am 2012-01-16 19:17:24.496410002 +0100 -@@ -12,6 +12,7 @@ - player.cpp magic.cpp - - AM_CPPFLAGS = -DAKODE_SEARCHDIR=\"$(libdir)\" -+AM_CXXFLAGS = -fPIC - - libakode_la_LDFLAGS = -no-undefined -version-info 2:0:0 $(all_libraries) - libakode_la_LIBADD = $(LIBPTHREAD) $(AKODE_LIBDL) $(LIBSEM) ---- akode-2.0.2/configure.in.in.ORI 2013-05-19 23:25:31.450512262 +0200 -+++ akode-2.0.2/configure.in.in 2013-05-19 23:25:37.156390421 +0200 -@@ -55,7 +55,7 @@ - - dnl without this order in this file, automake will be confused! - dnl --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADER(config.h) - - dnl checks for programs. - dnl first check for c/c++ compilers ---- akode-2.0.2/admin/configure.in.min~ 2013-05-19 23:35:21.532965131 +0200 -+++ akode-2.0.2/admin/configure.in.min 2013-05-19 23:34:19.011289846 +0200 -@@ -41,7 +41,7 @@ - KDE_SET_PREFIX - - dnl generate the config header --AM_CONFIG_HEADER(config.h) dnl at the distribution this done -+AC_CONFIG_HEADER(config.h) dnl at the distribution this done - - dnl Checks for programs. - AC_CHECK_COMPILERS ---- akode-2.0.2/admin/cvs.sh.autotools 2007-01-15 10:06:45.000000000 +0100 -+++ akode-2.0.2/admin/cvs.sh 2013-05-19 23:37:14.145581582 +0200 -@@ -68,7 +68,7 @@ - echo "*** KDE requires automake $required_automake_version" - exit 1 - ;; -- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*) -+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]*) - echo "*** $AUTOMAKE_STRING found." - UNSERMAKE=no - ;; -@@ -128,7 +128,7 @@ - echo "*** Creating configure" - call_and_fix_autoconf - --if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then -+if egrep "^AC_CONFIG_HEADER" configure.in >/dev/null 2>&1; then - echo "*** Creating config.h template" - $AUTOHEADER || exit 1 - touch config.h.in -@@ -184,7 +184,7 @@ - fi - fi - $ACLOCAL $ACLOCALFLAGS --if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then -+if egrep "^AC_CONFIG_HEADER" configure.in >/dev/null 2>&1; then - echo "*** Creating config.h template" - $AUTOHEADER || exit 1 - touch config.h.in ---- akode-2.0.2/akode/configure.in.in.ORI 2013-05-19 23:39:02.874283156 +0200 -+++ akode-2.0.2/akode/configure.in.in 2013-05-19 23:39:13.381061201 +0200 -@@ -2,7 +2,7 @@ - dnl AC_OUTPUT(akode/akode-config) - dnl AC_OUTPUT(akode/akode.pc) - --AM_CONFIG_HEADER(akode/lib/akode_export.h) -+AC_CONFIG_HEADER(akode/lib/akode_export.h) - - AC_DEFUN([AC_CHECK_LIBFLAC], - [ diff --git a/redhat/extras/akode/akode-pulseaudio.patch b/redhat/extras/akode/akode-pulseaudio.patch deleted file mode 100644 index 6c226144f..000000000 --- a/redhat/extras/akode/akode-pulseaudio.patch +++ /dev/null @@ -1,438 +0,0 @@ -diff -urN akode-2.0.1.orig/Makefile.in akode-2.0.1/Makefile.in ---- akode-2.0.1.orig/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -169,9 +169,9 @@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -urN akode-2.0.1.orig/akode/Makefile.in akode-2.0.1/akode/Makefile.in ---- akode-2.0.1.orig/akode/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -158,9 +158,9 @@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -urN akode-2.0.1.orig/akode/akodeplay/Makefile.in akode-2.0.1/akode/akodeplay/Makefile.in ---- akode-2.0.1.orig/akode/akodeplay/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/akodeplay/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -170,9 +170,9 @@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -urN akode-2.0.1.orig/akode/configure.in.in akode-2.0.1/akode/configure.in.in ---- akode-2.0.2/akode/configure.in.in.pulseaudio 2007-02-06 22:47:43.000000000 +0100 -+++ akode-2.0.2/akode/configure.in.in 2012-01-13 19:32:55.027887451 +0100 -@@ -270,24 +270,24 @@ - AC_SUBST(JACK_LDFLAGS) - fi - --AC_ARG_WITH(polypaudio,AC_HELP_STRING([--with-polypaudio],[Enable Polypaudio server support @<:@default=check@:>@]),[polypaudio_test="$withval"],[polypaudio_test="yes"]) -+AC_ARG_WITH(pulseaudio,AC_HELP_STRING([--with-pulseaudio],[Enable PulseAudio server support @<:@default=check@:>@]),[pulseaudio_test="$withval"],[pulseaudio_test="yes"]) - --if test "x$polypaudio_test" = "xyes" ; then --AC_MSG_CHECKING(for Polypaudio 0.7 or later) --if $PKG_CONFIG --atleast-version 0.7 polyplib-simple >/dev/null 2>&1 ; then -- POLYP_CFLAGS="`$PKG_CONFIG --cflags polyplib-simple`" -- POLYP_LIBADD="`$PKG_CONFIG --libs-only-l polyplib-simple`" -- POLYP_LDFLAGS="`$PKG_CONFIG --libs-only-L polyplib-simple`" -- have_polyp=yes -+if test "x$pulseaudio_test" = "xyes" ; then -+AC_MSG_CHECKING(for PulseAudio 0.9.2 or later) -+if $PKG_CONFIG --atleast-version 0.9.2 libpulse-simple >/dev/null 2>&1 ; then -+ PULSE_CFLAGS="`$PKG_CONFIG --cflags libpulse-simple`" -+ PULSE_LIBADD="`$PKG_CONFIG --libs-only-l libpulse-simple`" -+ PULSE_LDFLAGS="`$PKG_CONFIG --libs-only-L libpulse-simple`" -+ have_pulse=yes - AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_LIBPOLYP, 1, -- [Define if you have polyplib (required if you want Polypaudio server support)]) -+ AC_DEFINE(HAVE_LIBPULSE, 1, -+ [Define if you have libpulse (required if you want PulseAudio server support)]) - else - AC_MSG_RESULT(not installed) - fi --AC_SUBST(POLYP_CFLAGS) --AC_SUBST(POLYP_LIBADD) --AC_SUBST(POLYP_LDFLAGS) -+AC_SUBST(PULSE_CFLAGS) -+AC_SUBST(PULSE_LIBADD) -+AC_SUBST(PULSE_LDFLAGS) - fi - - AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=check@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="yes"]) -@@ -482,7 +482,7 @@ - AM_CONDITIONAL(include_oss_sink, test x$have_oss = xyes) - AM_CONDITIONAL(include_sun_sink, test x$have_sun = xyes) - AM_CONDITIONAL(include_jack_sink, test x$have_jack = xyes) --AM_CONDITIONAL(include_polyp_sink, test x$have_polyp = xyes) -+AM_CONDITIONAL(include_polyp_sink, test x$have_pulse = xyes) - AM_CONDITIONAL(include_ffmpeg_decoder, test x$have_ffmpeg = xyes) - - AC_MSG_CHECKING(for compilable aKode) -diff -urN akode-2.0.1.orig/akode/lib/Makefile.in akode-2.0.1/akode/lib/Makefile.in ---- akode-2.0.1.orig/akode/lib/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/lib/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -194,9 +194,9 @@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -urN akode-2.0.1.orig/akode/plugins/Makefile.in akode-2.0.1/akode/plugins/Makefile.in ---- akode-2.0.1.orig/akode/plugins/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/plugins/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -154,9 +154,9 @@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -@@ -251,11 +251,11 @@ - @include_oss_sink_TRUE@AKODE_OSS_SINK = oss_sink - @include_sun_sink_TRUE@AKODE_SUN_SINK = sun_sink - @include_jack_sink_TRUE@AKODE_JACK_SINK = jack_sink --@include_polyp_sink_TRUE@AKODE_POLYP_SINK = polyp_sink -+@include_polyp_sink_TRUE@AKODE_PULSE_SINK = polyp_sink - SUBDIRS = $(AKODE_MPC_DECODER) $(AKODE_XIPH_DECODER) \ - $(AKODE_MPEG_DECODER) $(AKODE_FFMPEG_DECODER) \ - $(AKODE_ALSA_SINK) $(AKODE_OSS_SINK) $(AKODE_SUN_SINK) \ -- $(AKODE_JACK_SINK) $(AKODE_POLYP_SINK) \ -+ $(AKODE_JACK_SINK) $(AKODE_PULSE_SINK) \ - $(AKODE_SRC_RESAMPLER) - - #>- all: all-recursive -diff -urN akode-2.0.1.orig/akode/plugins/alsa_sink/Makefile.in akode-2.0.1/akode/plugins/alsa_sink/Makefile.in ---- akode-2.0.1.orig/akode/plugins/alsa_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/plugins/alsa_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -177,9 +177,9 @@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -urN akode-2.0.1.orig/akode/plugins/ffmpeg_decoder/Makefile.in akode-2.0.1/akode/plugins/ffmpeg_decoder/Makefile.in ---- akode-2.0.1.orig/akode/plugins/ffmpeg_decoder/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/plugins/ffmpeg_decoder/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -178,9 +178,9 @@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -urN akode-2.0.1.orig/akode/plugins/jack_sink/Makefile.in akode-2.0.1/akode/plugins/jack_sink/Makefile.in ---- akode-2.0.1.orig/akode/plugins/jack_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/plugins/jack_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -177,9 +177,9 @@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -urN akode-2.0.1.orig/akode/plugins/mpc_decoder/Makefile.in akode-2.0.1/akode/plugins/mpc_decoder/Makefile.in ---- akode-2.0.1.orig/akode/plugins/mpc_decoder/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/plugins/mpc_decoder/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -191,9 +191,9 @@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -urN akode-2.0.1.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in akode-2.0.1/akode/plugins/mpc_decoder/mppdec/Makefile.in ---- akode-2.0.1.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/plugins/mpc_decoder/mppdec/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -169,9 +169,9 @@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -urN akode-2.0.1.orig/akode/plugins/mpeg_decoder/Makefile.in akode-2.0.1/akode/plugins/mpeg_decoder/Makefile.in ---- akode-2.0.1.orig/akode/plugins/mpeg_decoder/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/plugins/mpeg_decoder/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -178,9 +178,9 @@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -urN akode-2.0.1.orig/akode/plugins/oss_sink/Makefile.in akode-2.0.1/akode/plugins/oss_sink/Makefile.in ---- akode-2.0.1.orig/akode/plugins/oss_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/plugins/oss_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -177,9 +177,9 @@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.am akode-2.0.1/akode/plugins/polyp_sink/Makefile.am ---- akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.am 2005-07-15 13:20:03.000000000 +0200 -+++ akode-2.0.1/akode/plugins/polyp_sink/Makefile.am 2006-09-06 14:38:04.000000000 +0200 -@@ -1,7 +1,7 @@ --INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(POLYP_CFLAGS) $(all_includes) -+INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(PULSE_CFLAGS) $(all_includes) - - lib_LTLIBRARIES = libakode_polyp_sink.la - - libakode_polyp_sink_la_SOURCES = polyp_sink.cpp --libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(POLYP_LDFLAGS) --libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(POLYP_LIBADD) -+libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(PULSE_LDFLAGS) -+libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(PULSE_LIBADD) -diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.in akode-2.0.1/akode/plugins/polyp_sink/Makefile.in ---- akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/plugins/polyp_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -177,9 +177,9 @@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -@@ -265,13 +265,13 @@ - target_vendor = @target_vendor@ - unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ - unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ --INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(POLYP_CFLAGS) $(all_includes) -+INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(PULSE_CFLAGS) $(all_includes) - lib_LTLIBRARIES = libakode_polyp_sink.la - libakode_polyp_sink_la_SOURCES = polyp_sink.cpp --#>- libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(POLYP_LDFLAGS) -+#>- libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(PULSE_LDFLAGS) - #>+ 1 --libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED) $(POLYP_LDFLAGS) --libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(POLYP_LIBADD) -+libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED) $(PULSE_LDFLAGS) -+libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(PULSE_LIBADD) - #>- all: all-am - #>+ 1 - all: docs-am all-am -diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/polyp_sink.cpp akode-2.0.1/akode/plugins/polyp_sink/polyp_sink.cpp ---- akode-2.0.1.orig/akode/plugins/polyp_sink/polyp_sink.cpp 2005-10-20 22:54:12.000000000 +0200 -+++ akode-2.0.1/akode/plugins/polyp_sink/polyp_sink.cpp 2006-09-06 15:14:52.000000000 +0200 -@@ -25,7 +25,7 @@ - #elif defined(HAVE_INTTYPES_H) - #include <inttypes.h> - #endif --#include <polyp/polyplib-simple.h> -+#include <pulse/simple.h> - - #include "audioframe.h" - #include "audiobuffer.h" -@@ -59,7 +59,7 @@ - - bool PolypSink::open() { - int error = 0; -- m_data->server = pa_simple_new(0, "akode-client", PA_STREAM_PLAYBACK, 0, "", &m_data->sample_spec, 0, 255, &error ); -+ m_data->server = pa_simple_new(0, "akode-client", PA_STREAM_PLAYBACK, 0, "", &m_data->sample_spec, 0, 0, &error ); - if (!m_data->server || error != 0) { - m_data->error = true; - close(); -diff -urN akode-2.0.1.orig/akode/plugins/src_resampler/Makefile.in akode-2.0.1/akode/plugins/src_resampler/Makefile.in ---- akode-2.0.1.orig/akode/plugins/src_resampler/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/plugins/src_resampler/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -178,9 +178,9 @@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -urN akode-2.0.1.orig/akode/plugins/sun_sink/Makefile.in akode-2.0.1/akode/plugins/sun_sink/Makefile.in ---- akode-2.0.1.orig/akode/plugins/sun_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/plugins/sun_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -175,9 +175,9 @@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -urN akode-2.0.1.orig/akode/plugins/xiph_decoder/Makefile.in akode-2.0.1/akode/plugins/xiph_decoder/Makefile.in ---- akode-2.0.1.orig/akode/plugins/xiph_decoder/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/plugins/xiph_decoder/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -185,9 +185,9 @@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -urN akode-2.0.1.orig/config.h.in akode-2.0.1/config.h.in ---- akode-2.0.1.orig/config.h.in 2006-07-23 00:17:04.000000000 +0200 -+++ akode-2.0.1/config.h.in 2006-09-06 14:44:55.000000000 +0200 -@@ -43,9 +43,9 @@ - /* Define if you have libOggFLAC (required for loading OggFLAC files) */ - #undef HAVE_LIBOGGFLAC - --/* Define if you have polyplib (required if you want Polypaudio server -+/* Define if you have libpulse (required if you want PulseAudio server - support) */ --#undef HAVE_LIBPOLYP -+#undef HAVE_LIBPULSE - - /* defined if you have libsamplerate library and header */ - #undef HAVE_LIBSAMPLERATE -diff -urN akode-2.0.1.orig/configure.in akode-2.0.1/configure.in ---- akode-2.0.2/configure.in.pulseaudio 2007-04-06 15:23:11.000000000 +0200 -+++ akode-2.0.2/configure.in 2012-01-13 19:39:23.676340535 +0100 -@@ -375,24 +375,24 @@ - AC_SUBST(JACK_LDFLAGS) - fi - --AC_ARG_WITH(polypaudio,AC_HELP_STRING([--with-polypaudio],[Enable Polypaudio server support @<:@default=check@:>@]),[polypaudio_test="$withval"],[polypaudio_test="yes"]) -+AC_ARG_WITH(pulseaudio,AC_HELP_STRING([--with-pulseaudio],[Enable PulseAudio server support @<:@default=check@:>@]),[pulseaudio_test="$withval"],[pulseaudio_test="yes"]) - --if test "x$polypaudio_test" = "xyes" ; then --AC_MSG_CHECKING(for Polypaudio 0.7 or later) --if $PKG_CONFIG --atleast-version 0.7 polyplib-simple >/dev/null 2>&1 ; then -- POLYP_CFLAGS="`$PKG_CONFIG --cflags polyplib-simple`" -- POLYP_LIBADD="`$PKG_CONFIG --libs-only-l polyplib-simple`" -- POLYP_LDFLAGS="`$PKG_CONFIG --libs-only-L polyplib-simple`" -- have_polyp=yes -+if test "x$pulseaudio_test" = "xyes" ; then -+AC_MSG_CHECKING(for PulseAudio 0.9.2 or later) -+if $PKG_CONFIG --atleast-version 0.9.2 libpulse-simple >/dev/null 2>&1 ; then -+ PULSE_CFLAGS="`$PKG_CONFIG --cflags libpulse-simple`" -+ PULSE_LIBADD="`$PKG_CONFIG --libs-only-l libpulse-simple`" -+ PULSE_LDFLAGS="`$PKG_CONFIG --libs-only-L libpulse-simple`" -+ have_pulse=yes - AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_LIBPOLYP, 1, -- [Define if you have polyplib (required if you want Polypaudio server support)]) -+ AC_DEFINE(HAVE_LIBPULSE, 1, -+ [Define if you have libpulse (required if you want PulseAudio server support)]) - else - AC_MSG_RESULT(not installed) - fi --AC_SUBST(POLYP_CFLAGS) --AC_SUBST(POLYP_LIBADD) --AC_SUBST(POLYP_LDFLAGS) -+AC_SUBST(PULSE_CFLAGS) -+AC_SUBST(PULSE_LIBADD) -+AC_SUBST(PULSE_LDFLAGS) - fi - - AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=check@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="yes"]) -@@ -587,7 +587,7 @@ - AM_CONDITIONAL(include_oss_sink, test x$have_oss = xyes) - AM_CONDITIONAL(include_sun_sink, test x$have_sun = xyes) - AM_CONDITIONAL(include_jack_sink, test x$have_jack = xyes) --AM_CONDITIONAL(include_polyp_sink, test x$have_polyp = xyes) -+AM_CONDITIONAL(include_polyp_sink, test x$have_pulse = xyes) - AM_CONDITIONAL(include_ffmpeg_decoder, test x$have_ffmpeg = xyes) - - AC_MSG_CHECKING(for compilable aKode) diff --git a/redhat/packages.el7 b/redhat/packages.el7 index 980c35452..eca5edaba 100644 --- a/redhat/packages.el7 +++ b/redhat/packages.el7 @@ -35,6 +35,7 @@ ffmpeg-devel fftw-devel file-devel flac-devel +flex-devel fontpackages-devel fribidi-devel gamin-devel @@ -80,6 +81,7 @@ libart_lgpl-devel libblkid-devel libcap-devel libcdio-devel +libcdio-paranoia-devel libconfig-devel libcurl-devel libdvdread-devel @@ -162,4 +164,3 @@ xmlto xorg-x11-font-utils xulrunner-devel xz-devel -libcdio-paranoia-devel diff --git a/redhat/tde-i18n/tde-i18n-14.0.0-extra_translations.patch b/redhat/tde-i18n/tde-i18n-14.0.0-extra_translations.patch index 07691abe7..447f09bdb 100644 --- a/redhat/tde-i18n/tde-i18n-14.0.0-extra_translations.patch +++ b/redhat/tde-i18n/tde-i18n-14.0.0-extra_translations.patch @@ -1,6 +1,6 @@ -diff -Nuar fr.p2/messages/tdebase/kcmbackground.po fr.p3/messages/tdebase/kcmbackground.po ---- fr.p2/messages/tdebase/kcmbackground.po 2014-06-07 15:36:34.455347661 +0200 -+++ fr.p3/messages/tdebase/kcmbackground.po 2014-06-07 16:44:15.728310955 +0200 +diff -Nuar tde-i18n/tde-i18n-fr/messages/tdebase/kcmbackground.po.ori tde-i18n/tde-i18n-fr/messages/tdebase/kcmbackground.po +--- tde-i18n/tde-i18n-fr/messages/tdebase/kcmbackground.po.ori 2014-06-07 15:36:34.455347661 +0200 ++++ tde-i18n/tde-i18n-fr/messages/tdebase/kcmbackground.po 2014-06-07 16:44:15.728310955 +0200 @@ -920,3 +920,9 @@ #, no-c-format msgid "Move &Up" @@ -11,9 +11,9 @@ diff -Nuar fr.p2/messages/tdebase/kcmbackground.po fr.p3/messages/tdebase/kcmbac + +msgid "Enables a smooth fading effect when changing background image." +msgstr "Activer un effet de fondu lors du changement de fond d'écran." -diff -Nuar fr.p2/messages/tdebase/kcmenergy.po fr.p3/messages/tdebase/kcmenergy.po ---- fr.p2/messages/tdebase/kcmenergy.po 2014-06-07 15:36:34.455347661 +0200 -+++ fr.p3/messages/tdebase/kcmenergy.po 2014-06-07 16:44:21.892169693 +0200 +diff -Nuar tde-i18n/tde-i18n-fr/messages/tdebase/kcmenergy.po.ori tde-i18n/tde-i18n-fr/messages/tdebase/kcmenergy.po +--- tde-i18n/tde-i18n-fr/messages/tdebase/kcmenergy.po.ori 2014-06-07 15:36:34.455347661 +0200 ++++ tde-i18n/tde-i18n-fr/messages/tdebase/kcmenergy.po 2014-06-07 16:44:21.892169693 +0200 @@ -102,3 +102,10 @@ "Choisissez la période d'inactivité après laquelle l'affichage doit être éteint. " "Ceci est le plus haut niveau d'économie d'énergie qui puisse être utilisé " @@ -25,9 +25,9 @@ diff -Nuar fr.p2/messages/tdebase/kcmenergy.po fr.p3/messages/tdebase/kcmenergy. +msgid "Configure KPowersave..." +msgstr "Configurer KPowersave..." + -diff -Nuar fr.p2/messages/tdebase/kcmkonq.po fr.p3/messages/tdebase/kcmkonq.po ---- fr.p2/messages/tdebase/kcmkonq.po 2014-06-07 15:52:30.603936867 +0200 -+++ fr.p3/messages/tdebase/kcmkonq.po 2014-06-07 16:44:27.234047255 +0200 +diff -Nuar tde-i18n/tde-i18n-fr/messages/tdebase/kcmkonq.po.ori tde-i18n/tde-i18n-fr/messages/tdebase/kcmkonq.po +--- tde-i18n/tde-i18n-fr/messages/tdebase/kcmkonq.po.ori 2014-06-07 15:52:30.603936867 +0200 ++++ tde-i18n/tde-i18n-fr/messages/tdebase/kcmkonq.po 2014-06-07 16:44:27.234047255 +0200 @@ -877,3 +877,43 @@ #: rootopts.cpp:276 msgid "Confirmation Required" @@ -72,9 +72,9 @@ diff -Nuar fr.p2/messages/tdebase/kcmkonq.po fr.p3/messages/tdebase/kcmkonq.po + +msgid "&Show free space overlay on device icons" +msgstr "&Afficher l'espace libre sur les icônes" -diff -Nuar fr.p2/messages/tdebase/kcmscreensaver.po fr.p3/messages/tdebase/kcmscreensaver.po ---- fr.p2/messages/tdebase/kcmscreensaver.po 2014-06-07 15:53:13.977782717 +0200 -+++ fr.p3/messages/tdebase/kcmscreensaver.po 2014-06-07 16:44:38.180796311 +0200 +diff -Nuar tde-i18n/tde-i18n-fr/messages/tdebase/kcmscreensaver.po.ori tde-i18n/tde-i18n-fr/messages/tdebase/kcmscreensaver.po +--- tde-i18n/tde-i18n-fr/messages/tdebase/kcmscreensaver.po.ori 2014-06-07 15:53:13.977782717 +0200 ++++ tde-i18n/tde-i18n-fr/messages/tdebase/kcmscreensaver.po 2014-06-07 16:44:38.180796311 +0200 @@ -362,3 +362,9 @@ msgid "Hide all active windows from the screen saver and use the desktop background as the screen saver input." @@ -85,9 +85,9 @@ diff -Nuar fr.p2/messages/tdebase/kcmscreensaver.po fr.p3/messages/tdebase/kcmsc + +msgid "Makes the unlock dialog box vibrate when entering an incorrect password." +msgstr "Faire vibrer la fenêtre de déverrouillage lorsqu'un mauvais mot de passe est saisi." -diff -Nuar fr.p2/messages/tdebase/kdesktop.po fr.p3/messages/tdebase/kdesktop.po ---- fr.p2/messages/tdebase/kdesktop.po 2014-06-07 15:49:50.020212889 +0200 -+++ fr.p3/messages/tdebase/kdesktop.po 2014-06-07 16:44:58.546329306 +0200 +diff -Nuar tde-i18n/tde-i18n-fr/messages/tdebase/kdesktop.po.ori tde-i18n/tde-i18n-fr/messages/tdebase/kdesktop.po +--- tde-i18n/tde-i18n-fr/messages/tdebase/kdesktop.po.ori 2014-06-07 15:49:50.020212889 +0200 ++++ tde-i18n/tde-i18n-fr/messages/tdebase/kdesktop.po 2014-06-07 16:44:58.546329306 +0200 @@ -250,6 +250,10 @@ msgid "Open Terminal Here..." msgstr "Ouvrir un Terminal..." @@ -99,9 +99,9 @@ diff -Nuar fr.p2/messages/tdebase/kdesktop.po fr.p3/messages/tdebase/kdesktop.po #: krootwm.cc:137 msgid "Configure Desktop..." msgstr "Configurer le bureau..." -diff -Nuar fr.p2/messages/tdebase/kicker.po fr.p3/messages/tdebase/kicker.po ---- fr.p2/messages/tdebase/kicker.po 2014-06-07 16:41:47.636699669 +0200 -+++ fr.p3/messages/tdebase/kicker.po 2014-06-07 16:45:04.820185402 +0200 +diff -Nuar tde-i18n/tde-i18n-fr/messages/tdebase/kicker.po.ori tde-i18n/tde-i18n-fr/messages/tdebase/kicker.po +--- tde-i18n/tde-i18n-fr/messages/tdebase/kicker.po.ori 2014-06-07 16:41:47.636699669 +0200 ++++ tde-i18n/tde-i18n-fr/messages/tdebase/kicker.po 2014-06-07 16:45:04.820185402 +0200 @@ -889,6 +889,18 @@ msgid "My Documents" msgstr "Mes Documents" diff --git a/redhat/tde-i18n/tde-i18n-14.0.0-fr-openterminalhere.patch b/redhat/tde-i18n/tde-i18n-14.0.0-fr-openterminalhere.patch deleted file mode 100644 index 86c1ab926..000000000 --- a/redhat/tde-i18n/tde-i18n-14.0.0-fr-openterminalhere.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -rcb kde-i18n-fr-3.5.10.ori/messages/kdebase/kdesktop.po kde-i18n-fr-3.5.10/messages/kdebase/kdesktop.po -*** tde-i18n-fr-3.5.10.ori/messages/tdebase/kdesktop.po 2011-07-21 10:02:12.261100210 +0200 ---- tde-i18n-fr-3.5.10/messages/tdebase/kdesktop.po 2011-07-21 10:05:55.365975529 +0200 -*************** -*** 246,251 **** ---- 246,255 ---- - msgid "Run Command..." - msgstr "Exécuter une commande..." - -+ #: krootwm.cc:135 (Trinity Specific) -+ msgid "Open Terminal..." -+ msgstr "Ouvrir un Terminal..." -+ - #: krootwm.cc:137 - msgid "Configure Desktop..." - msgstr "Configurer le bureau..." diff --git a/redhat/tde-i18n/tde-i18n-14.0.0-fr-tdesu_no_ignore_button.patch b/redhat/tde-i18n/tde-i18n-14.0.0-fr-tdesu_no_ignore_button.patch deleted file mode 100644 index 4aed514aa..000000000 --- a/redhat/tde-i18n/tde-i18n-14.0.0-fr-tdesu_no_ignore_button.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -rcb kde-i18n-fr-3.5.10.ORI/messages/kdebase/kdesu.po kde-i18n-fr-3.5.10/messages/kdebase/kdesu.po -*** kde-i18n-fr-3.5.10.ORI/messages/tdebase/tdesu.po 2010-12-19 01:32:05.649657741 +0100 ---- kde-i18n-fr-3.5.10/messages/tdebase/tdesu.po 2010-12-19 01:33:50.416539931 +0100 -*************** -*** 132,151 **** - #: sudlg.cpp:36 - msgid "" - "The action you requested needs root privileges. Please enter root's password " -! "below or click Ignore to continue with your current privileges." - msgstr "" - "L'action requise nécessite les droits du superutilisateur. Veuillez saisir " -! "ci-dessous le mot de passe du superutilisateur ou cliquez sur « Ignorer » pour " -! "continuer avec vos droits actuels." - - #: sudlg.cpp:40 - msgid "" - "The action you requested needs additional privileges. Please enter the password " -! "for \"%1\" below or click Ignore to continue with your current privileges." - msgstr "" - "L'action requise nécessite des droits supplémentaires. Veuillez saisir " -! "ci-dessous le mot de passe de « %1 » ou cliquez sur « Ignorer » pour continuer " -! "avec vos droits actuels." - - #: sudlg.cpp:48 - msgid "&Ignore" ---- 132,149 ---- - #: sudlg.cpp:36 - msgid "" - "The action you requested needs root privileges. Please enter root's password " -! "below." - msgstr "" - "L'action requise nécessite les droits du superutilisateur. Veuillez saisir " -! "ci-dessous le mot de passe du superutilisateur." - - #: sudlg.cpp:40 - msgid "" - "The action you requested needs additional privileges. Please enter the password " -! "for \"%1\" below." - msgstr "" - "L'action requise nécessite des droits supplémentaires. Veuillez saisir " -! "ci-dessous le mot de passe de « %1 »." - - #: sudlg.cpp:48 - msgid "&Ignore" -Seulement dans kde-i18n-fr-3.5.10/messages/kdebase: kdesu.po~ diff --git a/redhat/tde-i18n/tde-i18n-14.0.0-updates.patch b/redhat/tde-i18n/tde-i18n-14.0.0-updates.patch new file mode 100644 index 000000000..2113cb215 --- /dev/null +++ b/redhat/tde-i18n/tde-i18n-14.0.0-updates.patch @@ -0,0 +1,125 @@ +--- trinity-tde-i18n-14.0.0~pre253+9fe98288/tde-i18n-fr/messages/tdelibs/tdelibs.po.orig 2014-08-22 22:50:18.774213510 +0200 ++++ trinity-tde-i18n-14.0.0~pre253+9fe98288/tde-i18n-fr/messages/tdelibs/tdelibs.po 2014-08-22 23:04:26.927794495 +0200 +@@ -5557,24 +5557,34 @@ + + #: tdeui/tdeabouttde.cpp:34 + msgid "" +-"The <b>Trinity Desktop Environment</b> is a fork of the " ++"The <b>Trinity Desktop Environment</b> was born as a fork of the " + "K Desktop Environment version 3.5, which was originally written by the KDE Team, " + "a world-wide network of software engineers committed to <a " + "href=\"http://www.gnu.org/philosophy/free-sw.html\">Free Software</a> " +-"development.<br><br>No single group, company or organization controls the " ++"development. The name <i>Trinity</i> was chosen because the word means " ++"<i>Three</i> as in <i>continuation of KDE 3</i>.<br>Since then, TDE has evolved to be " ++"an indipendent and standalone computer desktop environment project. The developers " ++"have molded the code to its own identity without giving up on the efficiency, " ++"productivity and traditional user interface experience characteristic of the " ++"original KDE 3 series.<br><br>No single group, company or organization controls the " + "Trinity source code. Everyone is welcome to contribute to Trinity.<br><br>Visit <A " +-"HREF=\"http://www.trinitydesktop.org/\">http://www.trinitydesktop.org</A> for more information " +-"about Trinity, and <A HREF=\"http://www.kde.org/\">http://www.kde.org</A> " ++"HREF=\"http://www.trinitydesktop.org\">http://www.trinitydesktop.org</A> for more information " ++"about Trinity, and <A HREF=\"http://www.kde.org\">http://www.kde.org</A> " + "for more information on the KDE project. " + msgstr "" +-"L'<b>Environnement Bureautique Trinity</b> est un clone de l'environnement " +-"TDE version 3.5, originellement écrit par l'équipe KDE, des informaticiens " +-"du monde entier travaillant sur Internet au développement de <a " +-"href=\"http://www.gnu.org/philosophy/free-sw.fr.html\">logiciels libres</a>." +-"<br><br>Aucune société ni organisation ne contrôle le code source de Trinity, et chacun " +-"est invité à y contribuer.<br><br>Visitez <A HREF=\"http://www.trinitydesktop.org/\">" +-"http://www.trinitydesktop.org</A> pour plus d'informations sur Trinity, et <a " +-"href=\"http://www.kde.org/fr\">http://www.kde.org/fr</A> " ++"L'<b>Environnement Bureautique Trinity</b> est né par un fork de " ++"l'environnement KDE version 3.5, qui fut initialement créé par l'équipe KDE, " ++"des informaticiens du monde entier travaillant sur Internet au " ++"développement de <a href=\"http://www.gnu.org/philosophy/free-sw.fr.html\">" ++"logiciels libres</a>. Le nom <i>Trinity</i> a été choisi car ce mot signifie " ++"<i>trois</i>, indiquant la <i>continuité de KDE 3</i>.<br>Depuis, Trinity a évolué " ++"pour devenir un environnement de bureau indépendant. Les développeurs ont " ++"façonné le code pour lui donner une identité sans sacrifier les performances, " ++"la productivité, et l'expérience de l'interface utilisateur classique de " ++"KDE 3.<br>Aucune société ni organisation ne contrôle le code source de Trinity, " ++"et chacun est invité à y contribuer.<br><br>Visitez <a " ++"HREF=\"http://www.trinitydesktop.org\">http://www.trinitydesktop.org</A> pour plus d'informations " ++"sur Trinity, et <A HREF=\"http://www.kde.org/fr\">http://www.kde.org/fr</A> " + "pour plus d'informations sur le projet KDE." + + #: tdeui/tdeabouttde.cpp:43 +@@ -5583,7 +5593,7 @@ + "do so. However, you - the user - must tell us when " + "something does not work as expected or could be done better.<br><br>" + "The Trinity Desktop Environment has a bug tracking system. Visit " +-"<A HREF=\"http://bugs.pearsoncomputing.net/\">http://bugs.pearsoncomputing.net</A> or " ++"<A HREF=\"http://bugs.pearsoncomputing.net\">http://bugs.pearsoncomputing.net</A> or " + "use the \"Report Bug...\" dialog from the \"Help\" menu to report bugs.<br><br>" + "If you have a suggestion for improvement then you are welcome to use " + "the bug tracking system to register your wish. Make sure you use the " +@@ -5593,9 +5603,9 @@ + "faire. Cependant, vous - l'utilisateur(trice) - devez nous signaler ce qui ne " + "fonctionne pas correctement ou pourrait être perfectionné.<br><br>" + "L'Environnement de Bureau Trinity possède un système de suivi des bogues. Allez " +-"sur <A HREF=\"http://bugs.pearsoncomputing.net/\">http://bugs.pearsoncomputing.net</A> " +-"ou utilisez la boîte de dialogue « Rapport de bogue » du menu « Aide » pour signaler les " +-"erreurs.<br><br>Si vous voulez suggérer une amélioration, vous êtes invité(e) à utiliser le " ++"sur <A HREF=\"http://bugs.pearsoncomputing.net/\">http://bugs.pearsoncomputing.net/</A> " ++"ou utilisez la boîte de dialogue « Rapport de bogue » du menu « Aide » pour signaler les erreurs.<br><br>" ++"Si vous voulez suggérer une amélioration, vous êtes invité(e) à utiliser le " + "système de suivi des bogues pour enregistrer votre souhait. Assurez-vous " + "d'avoir utilisé l'option « Souhait » (wish)." + +@@ -5606,12 +5616,13 @@ + "program interfaces. You can provide graphics, themes, sounds, and " + "improved documentation. You decide!" + "<br><br>" +-"Visit " +-"<A HREF=\"http://www.trinitydesktop.org/jobs/\">http://www.trinitydesktop.org/jobs/</A> " +-"for information on some projects in which you can participate." ++"Visit the " ++"<A HREF=\"http://www.trinitydesktop.org/jobs\">TDE Development</A> " ++"webpage to find out how you can contribute or mail us using one of the " ++"available <A HREF=\"http://www.trinitydesktop.org/mailinglist.php\">mailing lists</A>." + "<br><br>" + "If you need more information or documentation, then a visit to " +-"<A HREF=\"http://www.trinitydesktop.org/docs/\">http://www.trinitydesktop.org/docs/</A> " ++"<A HREF=\"http://www.trinitydesktop.org/docs\">http://www.trinitydesktop.org/docs</A> " + "will provide you with what you need." + msgstr "" + "Il n'est pas nécessaire d'être programmeur pour être membre de l'équipe de Trinity. " +@@ -5629,23 +5640,21 @@ + + #: tdeui/tdeabouttde.cpp:67 + msgid "" +-"Trinity is available free of charge, but making it is not free.<br><br>" +-"<br><br>" +-"The Trinity team does need financial support. Most of the money is used to " +-"reimburse members and others on expenses they experienced when " +-"contributing to Trinity. You are encouraged to support Trinity through a financial " +-"donation, using one of the ways described at " ++"TDE is available free of charge, but making it is not free.<br><br>" ++"The Trinity team <i>does need</i> financial support. The money is used to " ++"support the expenses incurred to keep the TDE servers running, so that you - " ++"the user - can access them at any time. You are encouraged to support Trinity " ++"through a financial or hardware donation, using one of the ways described at " + "<a href=\"http://www.trinitydesktop.org/donate.php\">http://www.trinitydesktop.org/donate.php</a>." + "<br><br>Thank you very much in advance for your support!" + msgstr "" +-"Trinity est disponible gratuitement, mais sa réalisation a un coût." +-"<br><br>" +-"<br>L'équipe de Trinity a besoin d'un appui financier. La majeure partie de ses " +-"fonds sert à rembourser les membres et d'autres intervenants des dépenses " +-"qu'ils ont engagées lors de leur contribution à Trinity. Pour apporter votre " +-"participation financière à Trinity, utilisez l'une des possibilités décrites à " +-"l'adresse <a href=\"http://www.trinitydesktop.org/donate.php\">http://www.trinitydesktop.org/donate.php</a>." +-"<br><br>Nous vous remercions vivement de votre soutien." ++"TDE est disponible gratuitement, mais sa réalisation a un coût.<br><br>" ++"L'équipe Trinity a <i>besoin</i> d'un appui financier. Cet argent permet " ++"de supporter les dépenses liées au fonctionnement des serveurs TDE, pour " ++"que vous puissiez y accéder à tout moment. Vous pouvez soutenir Trinity " ++"en faisant un don d'argent ou de matériel, d'une manière décrite à l'adresse " ++"<a href=\"http://www.trinitydesktop.org/donate.php\">http://www.trinitydesktop.org/donate.php</a>." ++"<br><br>Nous vous remercions vivement de votre soutien!" + + #: tdeui/tdeabouttde.cpp:81 + #, c-format diff --git a/redhat/tde-i18n/tde-i18n-14.0.0.spec b/redhat/tde-i18n/tde-i18n-14.0.0.spec index 4c66d5f2b..ed153b693 100644 --- a/redhat/tde-i18n/tde-i18n-14.0.0.spec +++ b/redhat/tde-i18n/tde-i18n-14.0.0.spec @@ -49,7 +49,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz # Main patch: lots of updates for TDE R14.0.0 Patch1: tde-i18n-14.0.0-extra_translations.patch - +Patch2: tde-i18n-14.0.0-updates.patch BuildRequires: findutils BuildRequires: gettext @@ -685,9 +685,8 @@ Provides: trinity-kde-i18n-Chinese-Big5 = %{version}-%{release} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} # Patches for French translations -pushd tde-i18n-fr %patch1 -p1 -popd +%patch2 -p1 %build diff --git a/redhat/tdeartwork/tdeartwork-14.0.0.spec b/redhat/tdeartwork/tdeartwork-14.0.0.spec index e8c812144..80dcff1ad 100644 --- a/redhat/tdeartwork/tdeartwork-14.0.0.spec +++ b/redhat/tdeartwork/tdeartwork-14.0.0.spec @@ -664,6 +664,11 @@ This package is part of Trinity, and a component of the TDE artwork module. %{tde_datadir}/applnk/System/ScreenSavers/geodesic.desktop %endif +%if 0%{?fedora} >= 20 +%{tde_datadir}/applnk/System/ScreenSavers/projectiveplane.desktop +%{tde_datadir}/applnk/System/ScreenSavers/tessellimage.desktop +%endif + %endif ########## diff --git a/redhat/tdebase/tdebase-14.0.0-konsole_wordseps.patch b/redhat/tdebase/tdebase-14.0.0-konsole_wordseps.patch index 8bec27061..a0cb449a4 100644 --- a/redhat/tdebase/tdebase-14.0.0-konsole_wordseps.patch +++ b/redhat/tdebase/tdebase-14.0.0-konsole_wordseps.patch @@ -7,9 +7,9 @@ diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/kcontrol/konsole/kcmkonsol dialog->silence_secondsSB->setValue(config.readUnsignedNumEntry( "SilenceSeconds", 10 )); - dialog->word_connectorLE->setText(config.readEntry("wordseps",":@-./_~")); + dialog->word_connectorLE->setText(config.readEntry("wordseps",":@-./_~+")); - + dialog->metaAsAltModeCB->setChecked(config.readBoolEntry("metaAsAltMode",false)); + dialog->SchemaEditor1->setSchema(config.readEntry("schema")); - diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole.cpp trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole.cpp --- trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole.cpp 2013-07-10 07:56:40.112802782 +0200 +++ trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole.cpp 2013-07-10 07:58:53.698465376 +0200 @@ -20,8 +20,8 @@ diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole.cp - s_word_seps= config->readEntry("wordseps",":@-./_~"); + s_word_seps= config->readEntry("wordseps",":@-./_~+"); b_framevis = config->readBoolEntry("has frame",true); + b_metaAsAlt = config->readBoolEntry("metaAsAltMode",false); TQPtrList<TEWidget> tes = activeTEs(); - for (TEWidget *_te = tes.first(); _te; _te = tes.next()) { diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole_part.cpp trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole_part.cpp --- trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole_part.cpp 2013-07-10 07:56:40.112802782 +0200 +++ trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole_part.cpp 2013-07-10 07:58:53.684465202 +0200 @@ -30,10 +30,10 @@ diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole_pa n_scroll = TQMIN(config->readUnsignedNumEntry("scrollbar",TEWidget::SCRRIGHT),2); m_histSize = config->readNumEntry("history",DEFAULT_HISTORY_SIZE); - s_word_seps= config->readEntry("wordseps",":@-./_~"); -+ s_word_seps= config->readEntry("wordseps",":@-./_~+"); - ++ s_word_seps= config->readEntry("wordseps",":@-./_~+"); n_encoding = config->readNumEntry("encoding",0); + TQFont tmpFont = TDEGlobalSettings::fixedFont(); diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/TEWidget.cpp trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/TEWidget.cpp --- trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/TEWidget.cpp 2013-07-10 07:56:40.112802782 +0200 +++ trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/TEWidget.cpp 2013-07-10 07:58:53.690465276 +0200 diff --git a/redhat/tdebase/tdebase-14.0.0-mandriva_use_drakclock.patch b/redhat/tdebase/tdebase-14.0.0-mandriva_use_drakclock.patch new file mode 100644 index 000000000..9bee958e8 --- /dev/null +++ b/redhat/tdebase/tdebase-14.0.0-mandriva_use_drakclock.patch @@ -0,0 +1,16 @@ +--- ./kicker/applets/clock/clock.cpp.orig 2014-09-13 20:24:15.429011133 +0200 ++++ ./kicker/applets/clock/clock.cpp 2014-09-13 20:25:02.281084675 +0200 +@@ -1515,11 +1515,8 @@ + preferences(); + break; + case 103: +- proc << locate("exe", "tdesu"); +- proc << "--nonewdcop"; +- proc << TQString("%1 tde-clock.desktop --lang %2") +- .arg(locate("exe", "tdecmshell")) +- .arg(TDEGlobal::locale()->language()); ++ // Mageia/Mandriva only ++ proc << locate("exe", "drakclock"); + proc.start(TDEProcess::DontCare); + break; + case 104: |