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

RHEL/Fedora: updates kaffeine

Browse Source
pull/3/head
Francois Andriot 13 years ago
parent 2d6a8dc02b
commit 8b32b1132d
8 changed files with 3639 additions and 112 deletions
Show Stats Download Patch File Download Diff File

84
redhat/applications/kaffeine/1331343133:fd68e4c4940afb4529b16e2c3e3d0f379ac7b161.diff
Unescape View File

@ -1,84 +0,0 @@
commit fd68e4c4940afb4529b16e2c3e3d0f379ac7b161
Author: Darrell Anderson <humanreadable@yahoo.com>
Date: 1331343133 -0600
Fix nominal "tqt" typos and fix slow DVB start.
This closes bug reports 729 and 899.
diff --git a/kaffeine/src/player-parts/gstreamer-part/video.cpp b/kaffeine/src/player-parts/gstreamer-part/video.cpp
index 96752aa..32c8817 100644
--- a/kaffeine/src/player-parts/gstreamer-part/video.cpp
+++ b/kaffeine/src/player-parts/gstreamer-part/video.cpp
@@ -232,7 +232,7 @@ void VideoWindow::correctByAspectRatio( TQSize& frame )
case FOURBYTHREE: factor = 4.0 / 3.0; break;
case ANAMORPHIC: factor = 16.0 / 9.0; break;
case DVB: factor = 2.11; break;
- case STQUARE: factor = 1.0; break;
+ case SQUARE: factor = 1.0; break;
}
float frameAspect = (float)frame.width() / (float)frame.height();
@@ -291,7 +291,7 @@ void VideoWindow::slotAspectRatioDVB()
void VideoWindow::slotAspectRatioSquare()
{
- m_aspectRatio = STQUARE;
+ m_aspectRatio = SQUARE;
TQSize frame = getFrameSize();
correctByAspectRatio( frame );
emit signalNewFrameSize( frame );
diff --git a/kaffeine/src/player-parts/gstreamer-part/video.h b/kaffeine/src/player-parts/gstreamer-part/video.h
index c4d9f74..f7c5180 100644
--- a/kaffeine/src/player-parts/gstreamer-part/video.h
+++ b/kaffeine/src/player-parts/gstreamer-part/video.h
@@ -47,7 +47,7 @@ public:
FOURBYTHREE,
ANAMORPHIC,
DVB,
- STQUARE
+ SQUARE
};
void newState();
diff --git a/kaffeine/src/player-parts/xine-part/deinterlacequality.h b/kaffeine/src/player-parts/xine-part/deinterlacequality.h
index edc2fa9..6987de3 100644
--- a/kaffeine/src/player-parts/xine-part/deinterlacequality.h
+++ b/kaffeine/src/player-parts/xine-part/deinterlacequality.h
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#ifndef DEINTERLACETQUALITY_H
-#define DEINTERLACETQUALITY_H
+#ifndef DEINTERLACEQUALITY_H
+#define DEINTERLACEQUALITY_H
#include <kdialogbase.h>
@@ -77,4 +77,4 @@ private:
KPushButton* m_customConfigButton;
};
-#endif /* DEINTERLACETQUALITY_H */
+#endif /* DEINTERLACEQUALITY_H */
diff --git a/kaffeine/src/player-parts/xine-part/equalizer.h b/kaffeine/src/player-parts/xine-part/equalizer.h
index 7d43ec0..2e81096 100644
--- a/kaffeine/src/player-parts/xine-part/equalizer.h
+++ b/kaffeine/src/player-parts/xine-part/equalizer.h
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#ifndef ETQUALIZER_H
-#define ETQUALIZER_H
+#ifndef EQUALIZER_H
+#define EQUALIZER_H
#include <kdialogbase.h>
#include <kconfig.h>
@@ -77,4 +77,4 @@ private:
TQSlider* eq16kSlider;
};
-#endif /* ETQUALIZER_H */
+#endif /* EQUALIZER_H */

28
redhat/applications/kaffeine/kaffeine-3.5.13-fix_localization_files.patch
Unescape View File

@ -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";

0
redhat/applications/kaffeine/1331957353:b480e3db3a01b75376fa6b83e5b01efe104ccaec.diff → redhat/applications/kaffeine/kaffeine-3.5.13-fix_temporary_location.patch
Unescape View File

85
redhat/applications/kaffeine/1333649519:0e3d0ed603c6c8065fdcb77bc79b59a768fc6a5b.diff → redhat/applications/kaffeine/kaffeine-3.5.13-fix_typos_branding_tqt.patch
Unescape View File

@ -41,6 +41,49 @@ index 2b1d2e7..57b9254 100644
* @return 0 on success, -1 on failure. * @return 0 on success, -1 on failure.
*/ */
typedef int (*en50221_app_auth_request_callback) (void *arg, 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 diff --git a/kaffeine/src/kmultitabbar.cpp b/kaffeine/src/kmultitabbar.cpp
index 8d85e01..e8148a7 100644 index 8d85e01..e8148a7 100644
--- a/kaffeine/src/kmultitabbar.cpp --- a/kaffeine/src/kmultitabbar.cpp
@ -83,11 +126,11 @@ index 8d85e01..e8148a7 100644
m_btnTabSep->setFixedHeight(4); m_btnTabSep->setFixedHeight(4);
diff --git a/kaffeine/src/kmultitabbar.h b/kaffeine/src/kmultitabbar.h diff --git a/kaffeine/src/kmultitabbar.h b/kaffeine/src/kmultitabbar.h
index 72fa884..2932cc2 100644 index 72fa884..2932cc2 100644
--- kaffeine/kaffeine/src/kmultitabbar.h.orig 2011-08-17 23:23:42.000000000 +0200 --- a/kaffeine/src/kmultitabbar.h
+++ kaffeine/kaffeine/src/kmultitabbar.h 2012-04-25 23:51:09.339505891 +0200 +++ b/kaffeine/src/kmultitabbar.h
@@ -55,16 +55,16 @@ @@ -55,16 +55,16 @@ class /*KUTILS_EXPORT*/ KMultiTabBar: public TQWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
- enum KMultiTabBarMode{Horizontal,Vertical}; - enum KMultiTabBarMode{Horizontal,Vertical};
+ 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 +++ b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
@@ -54,7 +54,7 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin @@ -54,7 +54,7 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin
label = new TQLabel(i18n("Prefered audio driver"), frame); label = new TQLabel(i18n("Prefered audio driver"), frame);
tqlayout->addWidget(label, 1, 0); layout->addWidget(label, 1, 0);
tqlayout->addWidget(m_audioDriverBox, 1, 1); layout->addWidget(m_audioDriverBox, 1, 1);
- tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); - layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
+ tqlayout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1); + layout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1);
//Video Page //Video Page
frame = addPage(i18n("Video"), i18n("Video Options"), KGlobal::iconLoader()->loadIcon("video", KIcon::Panel, frame = addPage(i18n("Video"), i18n("Video Options"), KGlobal::iconLoader()->loadIcon("video", KIcon::Panel,
@@ -67,7 +67,7 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin @@ -67,7 +67,7 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin
label = new TQLabel(i18n("Prefered video driver")+ "*", frame); label = new TQLabel(i18n("Prefered video driver")+ "*", frame);
tqlayout->addWidget(label, 1, 0); layout->addWidget(label, 1, 0);
tqlayout->addWidget(m_videoDriverBox, 1, 1); layout->addWidget(m_videoDriverBox, 1, 1);
- tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); - layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
+ tqlayout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1); + layout->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(new TQLabel(TQString("<small>") + i18n("* Restart required!") + "</small>", frame), 10, 1);
//Media page //Media page
@@ -80,7 +80,7 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin @@ -80,7 +80,7 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin
label = new TQLabel(i18n("CD, VCD, DVD drive"), frame); label = new TQLabel(i18n("CD, VCD, DVD drive"), frame);
tqlayout->addWidget(label, 1, 0); layout->addWidget(label, 1, 0);
tqlayout->addWidget(m_driveEdit, 1, 1); layout->addWidget(m_driveEdit, 1, 1);
- tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); - layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
+ tqlayout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1); + layout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1);
} }
GStreamerConfig::~GStreamerConfig() GStreamerConfig::~GStreamerConfig()
@ -214,10 +257,10 @@ index 98ff969..9fc18e6 100644
if (TQApplication::reverseLayout()) if (TQApplication::reverseLayout())
diff --git a/kaffeine/src/player-parts/xine-part/xineconfig.cpp b/kaffeine/src/player-parts/xine-part/xineconfig.cpp diff --git a/kaffeine/src/player-parts/xine-part/xineconfig.cpp b/kaffeine/src/player-parts/xine-part/xineconfig.cpp
index 6d6a2d4..1281911 100644 index 6d6a2d4..1281911 100644
--- kaffeine/kaffeine/src/player-parts/xine-part/xineconfig.cpp.orig 2011-08-17 23:23:40.000000000 +0200 --- a/kaffeine/src/player-parts/xine-part/xineconfig.cpp
+++ kaffeine/kaffeine/src/player-parts/xine-part/xineconfig.cpp 2012-04-25 23:53:25.094399051 +0200 +++ b/kaffeine/src/player-parts/xine-part/xineconfig.cpp
@@ -135,7 +135,7 @@ @@ -135,7 +135,7 @@ XineConfigEntry::XineConfigEntry(TQWidget* parent, TQGridLayout* grid, int row,
description->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter ); description->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
grid->addWidget(description, row, 1); grid->addWidget(description, row, 1);
- KSeparator* separator = new KSeparator(Qt::Horizontal, parent); - KSeparator* separator = new KSeparator(Qt::Horizontal, parent);

1403
redhat/applications/kaffeine/kaffeine-3.5.13-remove_additional_tq_conversions.patch
View File

File diff suppressed because it is too large Load Diff

2103
redhat/applications/kaffeine/kaffeine-3.5.13-rename_old_tq_methods.patch
View File

File diff suppressed because it is too large Load Diff

14
redhat/applications/kaffeine/kaffeine-3.5.13-work_around_xine_crash.patch
Unescape View File

@ -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

34
redhat/applications/kaffeine/trinity-kaffeine.spec
Unescape View File

@ -1,7 +1,7 @@
# Default version for this component # Default version for this component
%define kdecomp kaffeine %define kdecomp kaffeine
%define version 0.8.8 %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 TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
@ -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] # [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 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. # [kaffeine] Rename old tq methods that no longer need a unique name[Commit #60ed202f]
Patch2: 1331957353:b480e3db3a01b75376fa6b83e5b01efe104ccaec.diff Patch1: kaffeine-3.5.13-rename_old_tq_methods.patch
# [kaffeine] Fix typos, branding, and inadvertent tqt changes. # [kaffeine] Remove additional unneeded tq method conversions [Commit #701a1249]
Patch3: 1333649519:0e3d0ed603c6c8065fdcb77bc79b59a768fc6a5b.diff Patch2: kaffeine-3.5.13-remove_additional_tq_conversions.patch
# [kaffeine] Rename obsolete tq methods to standard names [Commit #66805baf]
Patch3: kdebase-3.5.13-rename_obsolete_tq_methods.patch
# [kaffeine] Rename a few stragglers [Commit #89b5fd35]
Patch4: kdebase-3.5.13-renames_a_few_stragglers.patch
# [kaffeine] Error out if critical OSD-related defines are not set [Commit #25b89439]
Patch5: kdebase-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: kdebase-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) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -212,6 +228,10 @@ update-desktop-database >& /dev/null ||:
%changelog %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 * Mon Apr 23 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-1
- Updates version to 0.8.8 - Updates version to 0.8.8
- Fix nominal "tqt" typos and fix slow DVB start. [Bug #729, #899] - Fix nominal "tqt" typos and fix slow DVB start. [Bug #729, #899]

Write Preview
Loading…
Cancel
Save