TDE
/
tde-packaging
9
1
Fork 1
Code Issues 10 Pull Requests 1 Releases Wiki Activity

RPM Packaging: update kasablanca

Browse Source
pull/3/head
François Andriot 9 years ago
parent 0d20c47141
commit fdf9448db9
19 changed files with 82 additions and 5329 deletions
Show Stats Download Patch File Download Diff File

BIN
redhat/applications/kaffeine/508cb342-logo
View File

Binary file not shown.

25
redhat/applications/kaffeine/kaffeine-3.5.13-error_out_if_critical_osd_defines_not_set.patch
Unescape View File

@ -1,25 +0,0 @@
commit 25b89439bbdcbc245b2a4125d2345afaa32fb952
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1326858742 -0600
Error out if critical OSD-related defines are not set
diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
index acc9937..68d47ac 100644
--- a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
+++ b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
@@ -1513,6 +1513,14 @@ bool KXineWidget::playDvb()
return true;
}
+#ifndef Q_BYTE_ORDER
+#error Q_BYTE_ORDER is not defined!
+#endif
+
+#ifndef TQ_LITTLE_ENDIAN
+#error TQ_LITTLE_ENDIAN is not defined!
+#endif
+
#if Q_BYTE_ORDER == TQ_LITTLE_ENDIAN
#define rgb2yuv(R,G,B) ((((((66*R+129*G+25*B+128)>>8)+16)<<8)|(((112*R-94*G-18*B+128)>>8)+128))<<8|(((-38*R-74*G+112*B+128)>>8)+128))
#else

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

@ -1,28 +0,0 @@
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";

19
redhat/applications/kaffeine/kaffeine-3.5.13-fix_program_name.patch
Unescape View File

@ -1,19 +0,0 @@
commit 4e982fa326fb619ec61e86cb0088d4b3002b2281
Author: Slávek Banko <slavek.banko@axis.cz>
Date: 1343089272 +0200
Added automake initialization with proper program name and version
This resolves Bug 858
diff --git a/configure.in.in b/configure.in.in
index 144aef9..9751e7c 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -1,4 +1,7 @@
#MIN_CONFIG(3.3)
+
+AM_INIT_AUTOMAKE(kaffeine, 0.8.8)
+
CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
if test "$build_arts" = "yes"; then

97
redhat/applications/kaffeine/kaffeine-3.5.13-fix_slow_dvb_start.patch
Unescape View File

@ -1,97 +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 */
diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
index 68d47ac..ab87338 100644
--- a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
+++ b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
@@ -3889,7 +3889,7 @@ void KXineWidget::getScreenshot(uchar*& rgb32BitData, int& videoWidth, int& vide
break;
default:
warningOut(TQString("Screenshot: Unknown aspect ratio: %1 - using 4:3").arg(ratio));
- case XINE_VO_ASPECT_STQUARE:
+ case XINE_VO_ASPECT_SQUARE:
debugOut("Screenshot: got video aspect: 1:1");
desired_ratio = image_ratio;
break;

31
redhat/applications/kaffeine/kaffeine-3.5.13-fix_temporary_location.patch
Unescape View File

@ -1,31 +0,0 @@
commit b480e3db3a01b75376fa6b83e5b01efe104ccaec
Author: Darrell Anderson <humanreadable@yahoo.com>
Date: 1331957353 -0500
Change location where Kaffeine stores temporary pipe files from $HOME to
the more appropriate $TDEHOME/tmp-$HOSTNAME.
diff --git a/kaffeine/src/input/dvb/dvbpanel.cpp b/kaffeine/src/input/dvb/dvbpanel.cpp
index 365b7ac..969b62b 100644
--- a/kaffeine/src/input/dvb/dvbpanel.cpp
+++ b/kaffeine/src/input/dvb/dvbpanel.cpp
@@ -1065,7 +1065,8 @@ void DvbPanel::setConfig()
connect( d, TQT_SIGNAL(isRecording(bool)), this, TQT_SLOT(setRecordLed(bool)) );
connect( d, TQT_SIGNAL(playDvb()), this, TQT_SLOT(pipeOpened()) );
}
- fifoName = TQDir::homeDirPath()+"/.kaxtv.ts";
+// fifoName = TQDir::homeDirPath()+"/.kaxtv.ts";
+ fifoName = KGlobal::dirs()->saveLocation("tmp")+"/.kaxtv.ts";
TQFile f( fifoName );
if ( f.exists() )
f.remove();
@@ -1073,7 +1074,8 @@ void DvbPanel::setConfig()
perror( fifoName.latin1() );
fifoName = "";
}
- fifoName1 = TQDir::homeDirPath()+"/.kaxtv1.ts";
+// fifoName1 = TQDir::homeDirPath()+"/.kaxtv1.ts";
+ fifoName1 = KGlobal::dirs()->saveLocation("tmp")+"/.kaxtv1.ts";
TQFile f1( fifoName1 );
if ( f1.exists() )
f1.remove();

240
redhat/applications/kaffeine/kaffeine-3.5.13-fix_typos_branding_tqt.patch
Unescape View File

@ -1,240 +0,0 @@
commit 0e3d0ed603c6c8065fdcb77bc79b59a768fc6a5b
Author: Darrell Anderson <humanreadable@yahoo.com>
Date: 1333649519 -0500
Fix typos, branding, and inadvertent tqt changes.
diff --git a/kaffeine/src/input/dvb/dvbpanel.cpp b/kaffeine/src/input/dvb/dvbpanel.cpp
index 969b62b..bbc4e32 100644
--- a/kaffeine/src/input/dvb/dvbpanel.cpp
+++ b/kaffeine/src/input/dvb/dvbpanel.cpp
@@ -1065,8 +1065,7 @@ void DvbPanel::setConfig()
connect( d, TQT_SIGNAL(isRecording(bool)), this, TQT_SLOT(setRecordLed(bool)) );
connect( d, TQT_SIGNAL(playDvb()), this, TQT_SLOT(pipeOpened()) );
}
-// fifoName = TQDir::homeDirPath()+"/.kaxtv.ts";
- fifoName = KGlobal::dirs()->saveLocation("tmp")+"/.kaxtv.ts";
+ fifoName = KGlobal::dirs()->saveLocation("tmp")+".kaxtv.ts";
TQFile f( fifoName );
if ( f.exists() )
f.remove();
@@ -1074,8 +1073,7 @@ void DvbPanel::setConfig()
perror( fifoName.latin1() );
fifoName = "";
}
-// fifoName1 = TQDir::homeDirPath()+"/.kaxtv1.ts";
- fifoName1 = KGlobal::dirs()->saveLocation("tmp")+"/.kaxtv1.ts";
+ fifoName1 = KGlobal::dirs()->saveLocation("tmp")+".kaxtv1.ts";
TQFile f1( fifoName1 );
if ( f1.exists() )
f1.remove();
diff --git a/kaffeine/src/input/dvb/lib/libdvben50221/en50221_app_auth.h b/kaffeine/src/input/dvb/lib/libdvben50221/en50221_app_auth.h
index 2b1d2e7..57b9254 100644
--- a/kaffeine/src/input/dvb/lib/libdvben50221/en50221_app_auth.h
+++ b/kaffeine/src/input/dvb/lib/libdvben50221/en50221_app_auth.h
@@ -42,7 +42,7 @@ extern "C" {
* @param session_number Session number concerned.
* @param auth_protocol_id Auth protocol id.
* @param auth_data Data for the request.
- * @param auth_data_lenghth Number of bytes.
+ * @param auth_data_length Number of bytes.
* @return 0 on success, -1 on failure.
*/
typedef int (*en50221_app_auth_request_callback) (void *arg,
diff --git a/kaffeine/src/kmultitabbar.cpp b/kaffeine/src/kmultitabbar.cpp
index 8d85e01..e8148a7 100644
--- a/kaffeine/src/kmultitabbar.cpp
+++ b/kaffeine/src/kmultitabbar.cpp
@@ -347,7 +347,7 @@ int KMultiTabBarInternal::appendTab(const TQPixmap &pic ,int id,const TQString&
tab->installEventFilter(this);
tab->showActiveTabText(m_showActiveTabTexts);
- if (m_style==KMultiTabBar::KONTQSBC)
+ if (m_style==KMultiTabBar::KONQSBC)
{
if (m_expandedTabSize<tab->neededSize()) {
m_expandedTabSize=tab->neededSize();
@@ -570,7 +570,7 @@ void KMultiTabBarTab::setState(bool b)
void KMultiTabBarTab::updateState()
{
- if (m_style!=KMultiTabBar::KONTQSBC) {
+ if (m_style!=KMultiTabBar::KONQSBC) {
if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (down)) {
TQPushButton::setText(m_text);
} else {
@@ -626,7 +626,7 @@ void KMultiTabBarTab::drawButtonLabel(TQPainter *p) {
}
void KMultiTabBarTab::drawButton(TQPainter *paint)
{
- if (m_style!=KMultiTabBar::KONTQSBC) drawButtonStyled(paint);
+ if (m_style!=KMultiTabBar::KONQSBC) drawButtonStyled(paint);
else drawButtonClassic(paint);
}
@@ -858,7 +858,7 @@ KMultiTabBar::KMultiTabBar(KMultiTabBarMode bm, TQWidget *parent,const char *nam
setPosition((bm==KMultiTabBar::Vertical)?KMultiTabBar::Right:KMultiTabBar::Bottom);
setStyle(VSNET);
// setStyle(KDEV3);
- //setStyle(KONTQSBC);
+ //setStyle(KONQSBC);
m_l->insertWidget(0,m_internal);
m_l->insertWidget(0,m_btnTabSep=new TQFrame(this));
m_btnTabSep->setFixedHeight(4);
diff --git a/kaffeine/src/kmultitabbar.h b/kaffeine/src/kmultitabbar.h
index 72fa884..2932cc2 100644
--- a/kaffeine/src/kmultitabbar.h
+++ b/kaffeine/src/kmultitabbar.h
@@ -55,16 +55,16 @@
Q_OBJECT
TQ_OBJECT
public:
- enum KMultiTabBarMode{Horizontal,Vertical};
+ enum KMultiTabBarMode{Horizontal, Vertical};
enum KMultiTabBarPosition{Left, Right, Top, Bottom};
/**
* VSNET == Visual Studio .Net like (only show the text of active tabs
* KDEV3 == Kdevelop 3 like (always show the text)
- * KONTQSBC == konqy's classic sidebar style (unthemed), this one is disabled
+ * KONQSBC == konqy's classic sidebar style (unthemed), this one is disabled
* at the moment, but will be renabled soon too
*/
- enum KMultiTabBarStyle{VSNET=0, KDEV3=1, KONTQSBC=2, KDEV3ICON=3,STYLELAST=0xffff};
+ enum KMultiTabBarStyle{VSNET=0, KDEV3=1, KONQSBC=2, KDEV3ICON=3,STYLELAST=0xffff};
KMultiTabBar(KMultiTabBarMode bm,TQWidget *parent=0,const char *name=0);
virtual ~KMultiTabBar();
diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
index ccb56f3..b7e88c7 100644
--- a/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
label = new TQLabel(i18n("Prefered audio driver"), frame);
layout->addWidget(label, 1, 0);
layout->addWidget(m_audioDriverBox, 1, 1);
- layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
+ layout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1);
//Video Page
frame = addPage(i18n("Video"), i18n("Video Options"), KGlobal::iconLoader()->loadIcon("video", KIcon::Panel,
@@ -67,7 +67,7 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin
label = new TQLabel(i18n("Prefered video driver")+ "*", frame);
layout->addWidget(label, 1, 0);
layout->addWidget(m_videoDriverBox, 1, 1);
- layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
+ layout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1);
layout->addWidget(new TQLabel(TQString("<small>") + i18n("* Restart required!") + "</small>", frame), 10, 1);
//Media page
@@ -80,7 +80,7 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin
label = new TQLabel(i18n("CD, VCD, DVD drive"), frame);
layout->addWidget(label, 1, 0);
layout->addWidget(m_driveEdit, 1, 1);
- layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
+ layout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1);
}
GStreamerConfig::~GStreamerConfig()
diff --git a/kaffeine/src/player-parts/xine-part/positionslider.cpp b/kaffeine/src/player-parts/xine-part/positionslider.cpp
index 16b3978..9d64e26 100644
--- a/kaffeine/src/player-parts/xine-part/positionslider.cpp
+++ b/kaffeine/src/player-parts/xine-part/positionslider.cpp
@@ -97,8 +97,8 @@ bool PositionSlider::eventFilter(TQObject *obj, TQEvent *ev)
return false;
int range = maxValue() - minValue();
- int pos = (orientation() ==Qt::Horizontal) ? e->pos().x() : e->pos().y();
- int maxpos = (orientation() ==Qt::Horizontal) ? width() : height();
+ int pos = (orientation() == Horizontal) ? e->pos().x() : e->pos().y();
+ int maxpos = (orientation() == Horizontal) ? width() : height();
int value = pos * range / maxpos + minValue();
if (TQApplication::reverseLayout())
diff --git a/kaffeine/src/player-parts/xine-part/postfilter.cpp b/kaffeine/src/player-parts/xine-part/postfilter.cpp
index 8a691b8..4ed3eb6 100644
--- a/kaffeine/src/player-parts/xine-part/postfilter.cpp
+++ b/kaffeine/src/player-parts/xine-part/postfilter.cpp
@@ -153,7 +153,7 @@ PostFilter::PostFilter(const TQString& name, xine_t* engine, xine_audio_port_t*
m_xinePostParameter++;
}
}
- KSeparator* sep = new KSeparator(Qt::Horizontal, m_groupBox);
+ KSeparator* sep = new KSeparator(KSeparator::Horizontal, m_groupBox);
grid->addMultiCellWidget(sep, row, row, 0, 1);
row++;
KPushButton* deleteButton = new KPushButton(i18n("Delete Filter"), m_groupBox);
diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp
index 98ff969..9fc18e6 100644
--- a/kaffeine/src/player-parts/xine-part/xine_part.cpp
+++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp
@@ -1373,10 +1373,10 @@ void XinePart::initActions()
KStdAction::zoomIn(TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomIn()), actionCollection(), "zoom_in");
KStdAction::zoomOut(TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomOut()), actionCollection(), "zoom_out");
KStdAction::fitToPage(TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomOff()), actionCollection(), "zoom_off");
- new KAction(i18n("Zoom InQt::Horizontal"), NULL, CTRL|Key_H, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomInX()), actionCollection(), "zoom_in_x");
- new KAction(i18n("Zoom OutQt::Horizontal"), NULL, CTRL|SHIFT|Key_H, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomOutX()), actionCollection(), "zoom_out_x");
- new KAction(i18n("Zoom InQt::Vertical"), NULL, CTRL|Key_V, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomInY()), actionCollection(), "zoom_in_y");
- new KAction(i18n("Zoom OutQt::Vertical"), NULL, CTRL|SHIFT|Key_V, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomOutY()), actionCollection(), "zoom_out_y");
+ new KAction(i18n("Zoom In Horizontal"), NULL, CTRL|Key_H, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomInX()), actionCollection(), "zoom_in_x");
+ new KAction(i18n("Zoom Out Horizontal"), NULL, CTRL|SHIFT|Key_H, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomOutX()), actionCollection(), "zoom_out_x");
+ new KAction(i18n("Zoom In Vertical"), NULL, CTRL|Key_V, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomInY()), actionCollection(), "zoom_in_y");
+ new KAction(i18n("Zoom Out Vertical"), NULL, CTRL|SHIFT|Key_V, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomOutY()), actionCollection(), "zoom_out_y");
new KAction(i18n("Deinterlace &Quality"), "blend", CTRL|Key_I, TQT_TQOBJECT(this), TQT_SLOT(slotDeinterlaceQuality()), actionCollection(), "video_deinterlace_quality");
new KAction(i18n("&Video Settings"), "configure", Key_V, TQT_TQOBJECT(this), TQT_SLOT(slotPictureSettings()), actionCollection(), "video_picture");
new KAction(i18n("&Equalizer"), NULL, Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotEqualizer()), actionCollection(), "equalizer");
@@ -1423,7 +1423,7 @@ void XinePart::initActions()
connect(m_xine, TQT_SIGNAL(signalSyncVolume()), TQT_TQOBJECT(this), TQT_SLOT(slotSyncVolume()));
new KWidgetAction(m_volume, i18n("Volume"), 0, 0, 0, actionCollection(), "audio_volume");
- m_position = new PositionSlider(Qt::Horizontal);
+ m_position = new PositionSlider(Horizontal);
TQToolTip::add
(m_position, i18n("Position"));
m_position->setRange(0, 65535);
@@ -2061,7 +2061,7 @@ void XinePart::zoomOff()
/********** volume slider ****************/
-VolumeSlider::VolumeSlider() : TQSlider(Qt::Horizontal, 0)
+VolumeSlider::VolumeSlider() : TQSlider(Horizontal, 0)
{
installEventFilter(this);
}
@@ -2092,8 +2092,8 @@ void VolumeSlider::wheelEvent(TQWheelEvent* e)
return FALSE;
int range = maxValue() - minValue();
- int pos = (orientation() ==Qt::Horizontal) ? e->pos().x() : e->pos().y();
- int maxpos = (orientation() ==Qt::Horizontal) ? width() : height();
+ int pos = (orientation() == Horizontal) ? e->pos().x() : e->pos().y();
+ int maxpos = (orientation() == Horizontal) ? width() : height();
int value = pos * range / maxpos + minValue();
if (TQApplication::reverseLayout())
diff --git a/kaffeine/src/player-parts/xine-part/xineconfig.cpp b/kaffeine/src/player-parts/xine-part/xineconfig.cpp
index 6d6a2d4..1281911 100644
--- a/kaffeine/src/player-parts/xine-part/xineconfig.cpp
+++ b/kaffeine/src/player-parts/xine-part/xineconfig.cpp
@@ -135,7 +135,7 @@ XineConfigEntry::XineConfigEntry(TQWidget* parent, TQGridLayout* grid, int row,
description->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
grid->addWidget(description, row, 1);
- KSeparator* separator = new KSeparator(Qt::Horizontal, parent);
+ KSeparator* separator = new KSeparator(KSeparator::Horizontal, parent);
grid->addMultiCellWidget(separator, row+1, row+1, 0, 1);
}
diff --git a/kaffeine/src/systemtray.cpp b/kaffeine/src/systemtray.cpp
index 745360f..e781ba0 100644
--- a/kaffeine/src/systemtray.cpp
+++ b/kaffeine/src/systemtray.cpp
@@ -100,7 +100,7 @@ void SystemTray::mousePressEvent(TQMouseEvent *e)
default:
KSystemTray::mousePressEvent(e);
break;
- case Qt::MidButton:
+ case MidButton:
if(!TQT_TQRECT_OBJECT(rect()).contains(e->pos()))
return;
actionCollection()->action("trayplay")->activate();

29
redhat/applications/kaffeine/kaffeine-3.5.13-fix_win32_codec_url.patch
Unescape View File

@ -1,29 +0,0 @@
commit 5086f3584a9548aa92dd880139107187b9fc8509
Author: Darrell Anderson <humanreadable@yahoo.com>
Date: 1342026813 -0500
Fixed online hyperlink to win32 codecs download location.
Thanks to Kristopher Gamrat.
diff --git a/kaffeine/src/instwizard.cpp b/kaffeine/src/instwizard.cpp
index 279d78b..21336c2 100644
--- a/kaffeine/src/instwizard.cpp
+++ b/kaffeine/src/instwizard.cpp
@@ -113,7 +113,7 @@ void InstWizard::internalWizard()
info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>";
else
info << "<font color=\"DarkRed\">" << i18n("No WIN32 codecs found in /usr/lib/win32. You're not able to play Windows Media 9 files, newer Real Media files and some less common formats. Download the codecs here:")
- << " <a href=\"http://www1.mplayerhq.hu/homepage/design7/codecs.html\">http://www.mplayerhq.hu</a>.</font>";
+ << " <a href=\"http://www1.mplayerhq.hu/design7/dload.html#binary_codecs\">http://www1.mplayerhq.hu/design7/dload.html#binary_codecs</a>.</font>";
//LIBDVDCSS
info << "<br><hr><b>" << "libdvdcss" << "...</b><br>";
@@ -190,7 +190,7 @@ void InstWizard::internalWizard()
if (infoString.contains("DarkRed"))
{
- info << i18n("Found some problems, but nevertheless Kaffeine may work.");
+ info << i18n("Found some problems, but nevertheless Kaffeine might work.");
}
else
{

42
redhat/applications/kaffeine/kaffeine-3.5.13-missing_ldflags.patch
Unescape View File

@ -1,42 +0,0 @@
--- kaffeine/kaffeine/src/player-parts/kaffeine-part/Makefile.am.ORI 2012-08-03 12:13:32.063876101 +0200
+++ kaffeine/kaffeine/src/player-parts/kaffeine-part/Makefile.am 2012-08-03 12:13:38.423736088 +0200
@@ -8,5 +8,5 @@
METASOURCES = AUTO
libkaffeinepart_la_SOURCES = kaffeinepart.cpp mrl.cpp playlistimport.cpp
-libkaffeinepart_la_LIBADD = $(LIB_KPARTS) $(all_libraries)
+libkaffeinepart_la_LIBADD = $(LIB_KPARTS) $(all_libraries) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KIO)
libkaffeinepart_la_LDFLAGS = -no-undefined -avoid-version
--- kaffeine/kaffeine/src/input/disc/plugins/Makefile.am.ORI 2012-08-03 12:17:08.799687224 +0200
+++ kaffeine/kaffeine/src/input/disc/plugins/Makefile.am 2012-08-03 12:17:35.613454250 +0200
@@ -18,7 +18,7 @@
kaffeineinclude_HEADERS = kaffeineaudioencoder.h
libkaffeineaudioencoder_la_SOURCES = kaffeineaudioencoder.cpp
-libkaffeineaudioencoder_la_LIBADD = $(LIB_KPARTS)
+libkaffeineaudioencoder_la_LIBADD = $(LIB_KPARTS) $(LIB_KDEUI) $(LIB_QT) $(LIB_OGGVORBIS)
libkaffeineaudioencoder_la_LDFLAGS = $(all_libraries) -version-info 0:1:0 -no-undefined
kde_servicetypes_DATA = kaffeineaudioencoder.desktop
--- kaffeine/kaffeine/src/input/dvb/plugins/epg/Makefile.am.ORI 2012-08-03 12:19:42.699882457 +0200
+++ kaffeine/kaffeine/src/input/dvb/plugins/epg/Makefile.am 2012-08-03 12:19:47.451553785 +0200
@@ -10,7 +10,7 @@
kaffeineinclude_HEADERS = kaffeinedvbevents.h kaffeinedvbsection.h
libkaffeineepgplugin_la_SOURCES = kaffeinedvbevents.cpp kaffeinedvbsection.cpp
-libkaffeineepgplugin_la_LIBADD = $(LIB_KPARTS)
+libkaffeineepgplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
libkaffeineepgplugin_la_LDFLAGS = $(all_libraries) -version-info 0:1:0 -no-undefined
kde_servicetypes_DATA = kaffeineepgplugin.desktop
--- kaffeine/kaffeine/src/input/dvb/plugins/stream/Makefile.am.ORI 2012-08-03 12:20:56.687973949 +0200
+++ kaffeine/kaffeine/src/input/dvb/plugins/stream/Makefile.am 2012-08-03 12:21:01.669658770 +0200
@@ -10,7 +10,7 @@
kaffeineinclude_HEADERS = kaffeinedvbplugin.h
libkaffeinedvbplugin_la_SOURCES = kaffeinedvbplugin.cpp
-libkaffeinedvbplugin_la_LIBADD = $(LIB_KPARTS)
+libkaffeinedvbplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KDEUI) $(LIB_QT)
libkaffeinedvbplugin_la_LDFLAGS = $(all_libraries) -version-info 0:1:0 -no-undefined
kde_servicetypes_DATA = kaffeinedvbplugin.desktop

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

643
redhat/applications/kaffeine/kaffeine-3.5.13-rename_obsolete_tq_methods.patch
Unescape View File

@ -1,643 +0,0 @@
commit 66805bafb9e1db535090dd74f6bdc56c2ac431c0
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1324497848 -0600
Rename obsolete tq methods to standard names
diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp
index e67603e..c48cf28 100644
--- a/kaffeine/src/input/audiobrowser/playlist.cpp
+++ b/kaffeine/src/input/audiobrowser/playlist.cpp
@@ -169,10 +169,10 @@ struct CoverPopup : public TQWidget
CoverPopup(const TQPixmap &image, const TQPoint &p) :
TQWidget(0, 0, WDestructiveClose | WX11BypassWM)
{
- TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
+ TQHBoxLayout *layout = new TQHBoxLayout(this);
TQLabel *label = new TQLabel(this);
- tqlayout->addWidget(label);
+ layout->addWidget(label);
label->setFrameStyle(TQFrame::Box | TQFrame::Raised);
label->setLineWidth(1);
label->setPixmap(image);
@@ -342,7 +342,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
KIO::NetAccess::mkdir(m_playlistDirectory, mainWidget);
kdDebug() << "PLAYLIST" << endl;
- TQGridLayout* tqlayout = new TQGridLayout( playlist, 4, 2, 3 );
+ TQGridLayout* layout = new TQGridLayout( playlist, 4, 2, 3 );
m_list = new UrlListView(playlist);
mainWidget->setAcceptDrops(true);
@@ -379,12 +379,12 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
m_list->setRenameable(TRACK_COLUMN);
m_list->setAllColumnsShowFocus(true);
m_list->setShowSortIndicator(true);
- tqlayout->addMultiCellWidget(m_list, 3, 3, 0, 1);
+ layout->addMultiCellWidget(m_list, 3, 3, 0, 1);
coverFrame = new CoverFrame( playlist );
coverFrame->setFixedWidth( 80 );
coverFrame->setFixedHeight( 80 );
- tqlayout->addMultiCellWidget(coverFrame, 0, 2, 0, 0);
+ layout->addMultiCellWidget(coverFrame, 0, 2, 0, 0);
TQHBoxLayout *h1 = new TQHBoxLayout();
searchBtn = new TQToolButton( playlist );
@@ -397,7 +397,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
m_playlistFilter = new KLineEdit(playlist);
m_playlistFilter->setFocusPolicy(TQ_ClickFocus);
h1->addWidget(m_playlistFilter);
- tqlayout->addLayout( h1, 2, 1 );
+ layout->addLayout( h1, 2, 1 );
TQHBoxLayout *h2 = new TQHBoxLayout();
TQLabel* playlistLabel = new TQLabel(i18n("Playlist:"), playlist);
@@ -410,10 +410,10 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
m_playlistSelector->setFocusPolicy(TQ_ClickFocus);
TQToolTip::add(m_playlistSelector, i18n("Select the active playlist. To change playlist name edit it and confirm with 'Return'."));
h2->addWidget(m_playlistSelector);
- tqlayout->addLayout( h2, 1, 1 );
+ layout->addLayout( h2, 1, 1 );
roller = new RollTitle( playlist );
- tqlayout->addWidget( roller, 0, 1 );
+ layout->addWidget( roller, 0, 1 );
KAccel* accel = new KAccel(mainWidget);
accel->insert("Delete selected", TQt::Key_Delete, this, TQT_SLOT(slotRemoveSelected()));
@@ -2145,7 +2145,7 @@ void PlayList::slotPaste()
TQStrList list;
- if (TQUriDrag::decode(TQApplication::tqclipboard()->data(), list))
+ if (TQUriDrag::decode(TQApplication::clipboard()->data(), list))
{
TQStringList urls;
for (TQStrListIterator it(list); *it; ++it)
@@ -2155,7 +2155,7 @@ void PlayList::slotPaste()
}
/** try to decode as text **/
TQString text;
- if (TQTextDrag::decode(TQApplication::tqclipboard()->data(), text))
+ if (TQTextDrag::decode(TQApplication::clipboard()->data(), text))
{
add(text, lastSelected);
}
@@ -2173,7 +2173,7 @@ void PlayList::slotCopy()
urlList.append(TQUriDrag::unicodeUriToUri(dynamic_cast<PlaylistItem *>(selected.at(i))->url()));
}
- TQApplication::tqclipboard()->setData(new TQUriDrag(urlList));
+ TQApplication::clipboard()->setData(new TQUriDrag(urlList));
}
void PlayList::slotSelectAll()
diff --git a/kaffeine/src/input/disc/paranoiasettings.ui b/kaffeine/src/input/disc/paranoiasettings.ui
index 1d163d3..30bbe54 100644
--- a/kaffeine/src/input/disc/paranoiasettings.ui
+++ b/kaffeine/src/input/disc/paranoiasettings.ui
@@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@@ -174,7 +174,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui b/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui
index d956e5b..03485cf 100644
--- a/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui
+++ b/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui
@@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@@ -51,7 +51,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -117,7 +117,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui b/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui
index b243300..f414545 100644
--- a/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui
+++ b/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui
@@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<vbox>
<property name="name">
@@ -107,7 +107,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kaffeine/src/input/dvb/audioeditorui.ui b/kaffeine/src/input/dvb/audioeditorui.ui
index 1131eec..ab94806 100644
--- a/kaffeine/src/input/dvb/audioeditorui.ui
+++ b/kaffeine/src/input/dvb/audioeditorui.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout24</cstring>
+ <cstring>layout24</cstring>
</property>
<vbox>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout23</cstring>
+ <cstring>layout23</cstring>
</property>
<hbox>
<property name="name">
@@ -60,7 +60,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout21</cstring>
+ <cstring>layout21</cstring>
</property>
<vbox>
<property name="name">
@@ -68,7 +68,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout16</cstring>
+ <cstring>layout16</cstring>
</property>
<hbox>
<property name="name">
@@ -76,7 +76,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout15</cstring>
+ <cstring>layout15</cstring>
</property>
<vbox>
<property name="name">
@@ -146,7 +146,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout14</cstring>
+ <cstring>layout14</cstring>
</property>
<hbox>
<property name="name">
@@ -154,7 +154,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<vbox>
<property name="name">
@@ -258,7 +258,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout19</cstring>
+ <cstring>layout19</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kaffeine/src/input/dvb/camdialog.ui b/kaffeine/src/input/dvb/camdialog.ui
index 9463cee..c255575 100644
--- a/kaffeine/src/input/dvb/camdialog.ui
+++ b/kaffeine/src/input/dvb/camdialog.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kaffeine/src/input/dvb/cammenudialog.ui b/kaffeine/src/input/dvb/cammenudialog.ui
index f6b5a00..022993a 100644
--- a/kaffeine/src/input/dvb/cammenudialog.ui
+++ b/kaffeine/src/input/dvb/cammenudialog.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<vbox>
<property name="name">
@@ -34,7 +34,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kaffeine/src/input/dvb/channeleditorui.ui b/kaffeine/src/input/dvb/channeleditorui.ui
index ceb3d62..add07e2 100644
--- a/kaffeine/src/input/dvb/channeleditorui.ui
+++ b/kaffeine/src/input/dvb/channeleditorui.ui
@@ -35,7 +35,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<vbox>
<property name="name">
@@ -43,7 +43,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@@ -83,7 +83,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@@ -138,7 +138,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -261,7 +261,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<grid>
<property name="name">
@@ -642,7 +642,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout14</cstring>
+ <cstring>layout14</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kaffeine/src/input/dvb/crontimerui.ui b/kaffeine/src/input/dvb/crontimerui.ui
index 87baff7..5441bee 100644
--- a/kaffeine/src/input/dvb/crontimerui.ui
+++ b/kaffeine/src/input/dvb/crontimerui.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<vbox>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout12</cstring>
+ <cstring>layout12</cstring>
</property>
<hbox>
<property name="name">
@@ -54,7 +54,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<vbox>
<property name="name">
@@ -271,7 +271,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<grid>
<property name="name">
diff --git a/kaffeine/src/input/dvb/scandialogui.ui b/kaffeine/src/input/dvb/scandialogui.ui
index dbcff8b..654e762 100644
--- a/kaffeine/src/input/dvb/scandialogui.ui
+++ b/kaffeine/src/input/dvb/scandialogui.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<vbox>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@@ -129,7 +129,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<vbox>
<property name="name">
@@ -487,7 +487,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kaffeine/src/input/dvb/subeditorui.ui b/kaffeine/src/input/dvb/subeditorui.ui
index fb8d391..857cdc5 100644
--- a/kaffeine/src/input/dvb/subeditorui.ui
+++ b/kaffeine/src/input/dvb/subeditorui.ui
@@ -35,7 +35,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout19</cstring>
+ <cstring>layout19</cstring>
</property>
<hbox>
<property name="name">
@@ -70,7 +70,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<hbox>
<property name="name">
@@ -101,7 +101,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout12</cstring>
+ <cstring>layout12</cstring>
</property>
<vbox>
<property name="name">
@@ -109,7 +109,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout16</cstring>
+ <cstring>layout16</cstring>
</property>
<hbox>
<property name="name">
@@ -117,7 +117,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout15</cstring>
+ <cstring>layout15</cstring>
</property>
<vbox>
<property name="name">
@@ -187,7 +187,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@@ -195,7 +195,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<vbox>
<property name="name">
@@ -232,7 +232,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<vbox>
<property name="name">
@@ -274,7 +274,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<vbox>
<property name="name">
diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp
index 9efebc9..10bd4be 100644
--- a/kaffeine/src/kaffeine.cpp
+++ b/kaffeine/src/kaffeine.cpp
@@ -1591,7 +1591,7 @@ void Kaffeine::slotFakeKeyEvent()
}
}
-/** slots for meta to tqunicode encoding **/
+/** slots for meta to unicode encoding **/
void Kaffeine::slotUseAlternateEncoding(bool useEncoding)
{
diff --git a/kaffeine/src/kmultitabbar.cpp b/kaffeine/src/kmultitabbar.cpp
index ecfa2c5..4ff1154 100644
--- a/kaffeine/src/kmultitabbar.cpp
+++ b/kaffeine/src/kmultitabbar.cpp
@@ -474,7 +474,7 @@ TQSize KMultiTabBarButton::sizeHint() const
}
#endif
if ( isMenuButton() )
- w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
+ w += style().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
if ( pixmap() ) {
TQPixmap *pm = (TQPixmap *)pixmap();
@@ -493,7 +493,7 @@ TQSize KMultiTabBarButton::sizeHint() const
h = TQMAX(h, sz.height());
}
- return (tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
+ return (style().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
expandedTo(TQApplication::globalStrut()));
}
diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
index dd843f5..ccb56f3 100644
--- a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
+++ b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
@@ -40,47 +40,47 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin
setInitialSize(TQSize(400,300), true);
TQFrame* frame = NULL;
- TQGridLayout* tqlayout = NULL;
+ TQGridLayout* layout = NULL;
TQLabel* label = NULL;
//Audio Page
frame = addPage(i18n("Audio"), i18n("Audio Options"), KGlobal::iconLoader()->loadIcon("sound", KIcon::Panel,
KIcon::SizeMedium));
- tqlayout = new TQGridLayout(frame, 10, 2);
- tqlayout->setMargin(10);
- tqlayout->setSpacing(10);
+ layout = new TQGridLayout(frame, 10, 2);
+ layout->setMargin(10);
+ layout->setSpacing(10);
m_audioDriverBox = new KComboBox(frame);
m_audioDriverBox->insertStringList(audioDrivers);
label = new TQLabel(i18n("Prefered audio driver"), frame);
- tqlayout->addWidget(label, 1, 0);
- tqlayout->addWidget(m_audioDriverBox, 1, 1);
- tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
+ layout->addWidget(label, 1, 0);
+ layout->addWidget(m_audioDriverBox, 1, 1);
+ layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
//Video Page
frame = addPage(i18n("Video"), i18n("Video Options"), KGlobal::iconLoader()->loadIcon("video", KIcon::Panel,
KIcon::SizeMedium));
- tqlayout = new TQGridLayout(frame, 10, 2);
- tqlayout->setMargin(10);
- tqlayout->setSpacing(10);
+ layout = new TQGridLayout(frame, 10, 2);
+ layout->setMargin(10);
+ layout->setSpacing(10);
m_videoDriverBox = new KComboBox(frame);
m_videoDriverBox->insertStringList(videoDrivers);
label = new TQLabel(i18n("Prefered video driver")+ "*", frame);
- tqlayout->addWidget(label, 1, 0);
- tqlayout->addWidget(m_videoDriverBox, 1, 1);
- tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
- tqlayout->addWidget(new TQLabel(TQString("<small>") + i18n("* Restart required!") + "</small>", frame), 10, 1);
+ layout->addWidget(label, 1, 0);
+ layout->addWidget(m_videoDriverBox, 1, 1);
+ layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
+ layout->addWidget(new TQLabel(TQString("<small>") + i18n("* Restart required!") + "</small>", frame), 10, 1);
//Media page
frame = addPage(i18n("Media"), i18n("Media Options"), KGlobal::iconLoader()->loadIcon("cdrom_unmount", KIcon::Panel,
KIcon::SizeMedium));
- tqlayout = new TQGridLayout(frame, 10, 2);
- tqlayout->setMargin(10);
- tqlayout->setSpacing(10);
+ layout = new TQGridLayout(frame, 10, 2);
+ layout->setMargin(10);
+ layout->setSpacing(10);
m_driveEdit = new KLineEdit(frame);
label = new TQLabel(i18n("CD, VCD, DVD drive"), frame);
- tqlayout->addWidget(label, 1, 0);
- tqlayout->addWidget(m_driveEdit, 1, 1);
- tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
+ layout->addWidget(label, 1, 0);
+ layout->addWidget(m_driveEdit, 1, 1);
+ layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
}
GStreamerConfig::~GStreamerConfig()
diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp
index 1b9c123..98ff969 100644
--- a/kaffeine/src/player-parts/xine-part/xine_part.cpp
+++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp
@@ -212,7 +212,7 @@ bool XinePart::openURL(const MRL& mrl)
if (firstLine.contains("smil", false))
{
kdDebug() << "XinePart: Try loading smil playlist\n";
- if (KMessageBox::warningYesNo(0, i18n("SMIL (Synchronized Multimedia Integration Language) support is rudimentary!\nXinePart can now try to playback contained video sources without any tqlayout. Proceed?"), TQString(), KStdGuiItem::yes(), KStdGuiItem::no(), "smil_warning") == KMessageBox::Yes)
+ if (KMessageBox::warningYesNo(0, i18n("SMIL (Synchronized Multimedia Integration Language) support is rudimentary!\nXinePart can now try to playback contained video sources without any layout. Proceed?"), TQString(), KStdGuiItem::yes(), KStdGuiItem::no(), "smil_warning") == KMessageBox::Yes)
{
if (!PlaylistImport::smil(localFile, m_mrl, m_playlist))
{
@@ -1240,7 +1240,7 @@ void XinePart::slotInfo()
if (m_xine->hasSaveURL())
ts << "<tr><td><b>" << i18n("Save Stream as") << ":</b></td><td> " << m_xine->getSaveURL() << "</td></tr>";
- ts << "<tr><td></td><td></td></tr>"; // added for better tqlayout
+ ts << "<tr><td></td><td></td></tr>"; // added for better layout
ts << "</table></qt>";
KMessageBox::information(0, info, i18n("Track info") );
}

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

30
redhat/applications/kaffeine/kaffeine-3.5.13-renames_a_few_stragglers.patch
Unescape View File

@ -1,30 +0,0 @@
commit 89b5fd35299d63e54cb2b36ec366d0071381458b
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1324748015 -0600
Rename a few stragglers
diff --git a/kaffeine/src/kmultitabbar.cpp b/kaffeine/src/kmultitabbar.cpp
index 4ff1154..8d85e01 100644
--- a/kaffeine/src/kmultitabbar.cpp
+++ b/kaffeine/src/kmultitabbar.cpp
@@ -654,8 +654,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
if (down) st|=TQStyle::Style_On;
- tqstyle().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
- tqstyle().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
+ style().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
+ style().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
switch (m_position) {
case KMultiTabBar::Left:
@@ -671,7 +671,7 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
paint->drawPixmap(0,0,pixmap);
break;
}
-// tqstyle().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
+// style().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
// colorGroup(),TQStyle::Style_Enabled);

14
redhat/applications/kaffeine/kaffeine-3.5.13.1-add_xine12_support.patch
Unescape View File

@ -1,14 +0,0 @@
--- kaffeine-3.5.13.1/kaffeine/src/player-parts/xine-part/kxinewidget.cpp.ORI 2012-10-03 21:39:27.711879801 +0200
+++ kaffeine-3.5.13.1/kaffeine/src/player-parts/xine-part/kxinewidget.cpp 2012-10-03 21:40:35.174370892 +0200
@@ -2642,7 +2642,11 @@
bool KXineWidget::getAutoplayPluginURLS(const TQString& plugin, TQStringList& list)
{
+#if XINE_MAJOR_VERSION > 1 || ( XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION >= 2 )
+ const char* const* urls = NULL;
+#else
char** urls = NULL;
+#endif
int num;
int i = 0;

284
redhat/applications/kaffeine/kaffeine-3.5.13.1.spec
Unescape View File

@ -1,284 +0,0 @@
# Default version for this component
%define kdecomp kaffeine
# 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 3.5.13 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 tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-%{kdecomp}
Summary: Xine-based media player
Version: 0.8.8
Release: 4%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Multimedia
URL: http://kaffeine.sourceforge.net/
Source0: kaffeine-3.5.13.1.tar.gz
# [kaffeine] Add Xine 1.2 support
Patch1: kaffeine-3.5.13.1-add_xine12_support.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext
BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
BuildRequires: libvorbis-devel
BuildRequires: libcdio-devel
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: libcdda-devel
BuildRequires: %{_lib}xext%{?mgaversion:6}-devel
BuildRequires: %{_lib}xtst-devel
BuildRequires: %{_lib}xinerama%{?mgaversion:1}-devel
# dvb
%if 0%{?pclinuxos} == 0
BuildRequires: kernel-headers
%endif
BuildRequires: libgstreamer-devel >= 0.10
BuildRequires: libgstreamer-plugins-base-devel >= 0.10
%else
BuildRequires: cdparanoia
BuildRequires: cdparanoia-devel
%if 0%{?suse_version}
BuildRequires: libcdio-paranoia-devel
%endif
BuildRequires: libXext-devel
BuildRequires: libXtst-devel
BuildRequires: libXinerama-devel
# dvb
BuildRequires: gstreamer-devel >= 0.10
%if 0%{?suse_version}
BuildRequires: gstreamer-0_10-plugins-base-devel
%else
BuildRequires: gstreamer-plugins-base-devel >= 0.10
BuildRequires: glibc-kernheaders
%endif
%endif
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
BuildRequires: libxcb-devel
%endif
# xine-lib
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
BuildRequires: libxine-devel
%endif
%if 0%{?rhel} || 0%{?fedora}
BuildRequires: xine-lib-devel
%endif
Requires: %{name}-libs = %{version}-%{release}
%description
Kaffeine is a xine-based media player for KDE. It plays back CDs,
and VCDs, and can decode all (local or streamed) multimedia formats
supported by xine-lib.
Additionally, Kaffeine is fully integrated in KDE, it supports drag
and drop and provides an editable playlist, a bookmark system, a
Konqueror plugin, OSD and much more.
%files -f %{kdecomp}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%{tde_bindir}/kaffeine
%{tde_libdir}/libkaffeinepart.so
%{tde_tdelibdir}/lib*.*
%{tde_datadir}/appl*/*/*.desktop
%{tde_datadir}/apps/gstreamerpart/
%{tde_datadir}/apps/kaffeine/
%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
%{tde_datadir}/apps/profiles/
%{tde_datadir}/icons/hicolor/*/*/*
%{tde_datadir}/mimelnk/*/*.desktop
%{tde_datadir}/service*/*.desktop
%{tde_tdedocdir}/HTML/en/kaffeine/
%post
touch --no-create %{tde_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database >& /dev/null ||:
/sbin/ldconfig || :
%postun
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database >& /dev/null ||:
/sbin/ldconfig || :
##########
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: trinity-tdelibs-devel
%description devel
%{summary}.
%files devel
%defattr(-,root,root,-)
%{tde_tdeincludedir}/kaffeine/
%{tde_libdir}/lib*.so
%exclude %{tde_libdir}/libkaffeinepart.so
%post devel
/sbin/ldconfig || :
%postun devel
/sbin/ldconfig || :
##########
%package libs
Summary: %{name} runtime libraries
Group: System Environment/Libraries
# include to be paranoid, installing libs-only is still mostly untested -- Rex
Requires: %{name} = %{version}-%{release}
%description libs
%{summary}.
%files libs
%defattr(-,root,root,-)
%{tde_libdir}/lib*.so.*
%post libs
/sbin/ldconfig || :
%postun libs
/sbin/ldconfig || :
##########
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif
%prep
%setup -q -n kaffeine-3.5.13.1
%patch1 -p1 -b .xine12
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
unset QTDIR || : ; source /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export KDEDIR=%{tde_prefix}
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
--mandir=%{tde_mandir} \
--enable-new-ldflags \
--disable-debug --disable-warnings \
--disable-dependency-tracking --enable-final \
--disable-rpath \
--with-xinerama \
--with-gstreamer \
--without-lame \
--with-extra-includes=%{tde_includedir}/tqt \
--with-extra-libs=%{_prefix}/%{_lib} \
--enable-closure \
%if 0%{?rhel} > 0 && 0%{?rhel} <= 5
--without-dvb \
%endif
%__make %{?_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf $RPM_BUILD_ROOT
%__make install DESTDIR=$RPM_BUILD_ROOT
## File lists
# locale's
%find_lang %{kdecomp}
# HTML (1.0)
HTML_DIR=$(kde-config --expandvars --install html)
if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
done
popd
fi
done
fi
# Unpackaged files
rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la
rm -f $RPM_BUILD_ROOT%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
%clean
rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-4
- Initial release for TDE 3.5.13.1
* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-3
- Add support for Mageia 2 and Mandriva 2011
- Added automake initialization with proper program name and version [Bug #858] [Commit #4e982fa3]
- Fixed online hyperlink to win32 codecs download location. [Commit #5086f358]
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-2
- Rebuilt for Fedora 17
- Adds more patches from GIT.
* Mon Apr 23 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-1
- Updates version to 0.8.8
- Fix nominal "tqt" typos and fix slow DVB start. [Bug #729, #899]
- Change location where Kaffeine stores temporary pipe files from $HOME to the more appropriate $KDEHOME/tmp-$HOSTNAME.
- Work around Xine crash when displaying still logo image by creating a small movie file to replace it [Bug #511, #559]
- Add man page
* Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.6-2
- Disable 'libxcb-devel' for RHEL 5 compilation
- Fix HTML directory location
* Wed Nov 09 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.6-1
- Spec file based on Fedora 8 'kaffeine-0.8.6-3'

305
redhat/applications/kaffeine/kaffeine-3.5.13.spec
Unescape View File

@ -1,305 +0,0 @@
# Default version for this component
%define kdecomp kaffeine
# 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 3.5.13 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 tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/kde
%define tde_tdeincludedir %{tde_includedir}/kde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-%{kdecomp}
Summary: Xine-based media player
Version: 0.8.8
Release: 3%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Multimedia
URL: http://kaffeine.sourceforge.net/
Source0: kaffeine-3.5.13.tar.gz
Source2: kaffeine.1
# [kaffeine] Work around Xine crash when displaying still logo image by creating a small movie file to replace it [Bug #511, #559]
Source1: 508cb342-logo
# [kaffeine] Rename old tq methods that no longer need a unique name[Commit #60ed202f]
Patch1: kaffeine-3.5.13-rename_old_tq_methods.patch
# [kaffeine] Remove additional unneeded tq method conversions [Commit #701a1249]
Patch2: kaffeine-3.5.13-remove_additional_tq_conversions.patch
# [kaffeine] Rename obsolete tq methods to standard names [Commit #66805baf]
Patch3: kaffeine-3.5.13-rename_obsolete_tq_methods.patch
# [kaffeine] Rename a few stragglers [Commit #89b5fd35]
Patch4: kaffeine-3.5.13-renames_a_few_stragglers.patch
# [kaffeine] Error out if critical OSD-related defines are not set [Commit #25b89439]
Patch5: kaffeine-3.5.13-error_out_if_critical_osd_defines_not_set.patch
# [kaffeine] Fix nominal "tqt" typos and fix slow DVB start. [Bug #729, #899] [Commit #fd68e4c4]
Patch6: kaffeine-3.5.13-fix_slow_dvb_start.patch
# [kaffeine] Change location where Kaffeine stores temporary pipe files from $HOME to the more appropriate $TDEHOME/tmp-$HOSTNAME. [Commit #b480e3db]
Patch7: kaffeine-3.5.13-fix_temporary_location.patch
# [kaffeine] Fix typos, branding, and inadvertent tqt changes. [Commit #0e3d0ed6]
Patch8: kaffeine-3.5.13-fix_typos_branding_tqt.patch
# [kaffeine] Fix installation of localization files [Bug #858]
Patch9: kaffeine-3.5.13-fix_localization_files.patch
# [kaffeine] Added automake initialization with proper program name and version [Bug #858] [Commit #4e982fa3]
Patch10: kaffeine-3.5.13-fix_program_name.patch
# [kaffeine] Fixed online hyperlink to win32 codecs download location. [Commit #5086f358]
Patch11: kaffeine-3.5.13-fix_win32_codec_url.patch
# [kaffeine] Missing LDFLAGS cause FTBFS under MGA2/MDV2011
Patch12: kaffeine-3.5.13-missing_ldflags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext
BuildRequires: trinity-kdelibs-devel
BuildRequires: libvorbis-devel
BuildRequires: libcdio-devel
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: libcdda-devel
BuildRequires: %{_lib}xine-devel
BuildRequires: %{_lib}xext%{?mgaversion:6}-devel
BuildRequires: %{_lib}xtst-devel
BuildRequires: %{_lib}xinerama%{?mgaversion:1}-devel
# dvb
BuildRequires: kernel-headers
BuildRequires: libgstreamer-devel >= 0.10
BuildRequires: libgstreamer-plugins-base-devel >= 0.10
%else
BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: xine-lib-devel
BuildRequires: libXext-devel
BuildRequires: libXtst-devel
BuildRequires: libXinerama-devel
# dvb
BuildRequires: glibc-kernheaders
BuildRequires: gstreamer-devel >= 0.10
BuildRequires: gstreamer-plugins-base-devel >= 0.10
%endif
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
BuildRequires: libxcb-devel
%endif
Requires: %{name}-libs = %{version}-%{release}
%description
Kaffeine is a xine-based media player for KDE. It plays back CDs,
and VCDs, and can decode all (local or streamed) multimedia formats
supported by xine-lib.
Additionally, Kaffeine is fully integrated in KDE, it supports drag
and drop and provides an editable playlist, a bookmark system, a
Konqueror plugin, OSD and much more.
%files -f %{kdecomp}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%{tde_bindir}/kaffeine
%{tde_libdir}/libkaffeinepart.so
%{tde_tdelibdir}/lib*.*
%{tde_datadir}/appl*/*/*.desktop
%{tde_datadir}/apps/gstreamerpart/
%{tde_datadir}/apps/kaffeine/
%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
%{tde_datadir}/apps/profiles/
%{tde_datadir}/icons/hicolor/*/*/*
%{tde_datadir}/mimelnk/*/*.desktop
%{tde_datadir}/service*/*.desktop
%{tde_tdedocdir}/HTML/en/kaffeine
%{tde_mandir}/*/*
%post
touch --no-create %{tde_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database >& /dev/null ||:
/sbin/ldconfig || :
%postun
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database >& /dev/null ||:
/sbin/ldconfig || :
##########
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: trinity-tdelibs-devel
%description devel
%{summary}.
%files devel
%defattr(-,root,root,-)
%{tde_tdeincludedir}/kaffeine/
%{tde_libdir}/lib*.so
%exclude %{tde_libdir}/libkaffeinepart.so
%post devel
/sbin/ldconfig || :
%postun devel
/sbin/ldconfig || :
##########
%package libs
Summary: %{name} runtime libraries
Group: System Environment/Libraries
# include to be paranoid, installing libs-only is still mostly untested -- Rex
Requires: %{name} = %{version}-%{release}
%description libs
%{summary}.
%files libs
%defattr(-,root,root,-)
%{tde_libdir}/lib*.so.*
%post libs
/sbin/ldconfig || :
%postun libs
/sbin/ldconfig || :
##########
%prep
%setup -q -n applications/kaffeine
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1 -b .ftbfs
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
unset QTDIR || : ; source /etc/profile.d/qt.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
--mandir=%{tde_mandir} \
--enable-new-ldflags \
--disable-debug --disable-warnings \
--disable-dependency-tracking --enable-final \
--disable-rpath \
--with-xinerama \
--with-gstreamer \
--without-lame \
--with-extra-includes=%{tde_includedir}/tqt \
--with-extra-libs=%{_prefix}/%{_lib} \
--enable-closure \
%if 0%{?rhel} > 0 && 0%{?rhel} <= 5
--without-dvb \
%endif
%__make %{?_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf $RPM_BUILD_ROOT
%__make install DESTDIR=$RPM_BUILD_ROOT
## File lists
# locale's
%find_lang %{kdecomp}
# HTML (1.0)
HTML_DIR=$(kde-config --expandvars --install html)
if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
done
popd
fi
done
fi
# Unpackaged files
rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la
rm -f $RPM_BUILD_ROOT%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/kaffeine/logo
%__install -D -m 644 %{SOURCE2} %{?buildroot}%{tde_mandir}/man1/kaffeine.1
%clean
rm -rf $RPM_BUILD_ROOT
%changelog
* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-3
- Add support for Mageia 2 and Mandriva 2011
- Added automake initialization with proper program name and version [Bug #858] [Commit #4e982fa3]
- Fixed online hyperlink to win32 codecs download location. [Commit #5086f358]
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-2
- Rebuilt for Fedora 17
- Adds more patches from GIT.
* Mon Apr 23 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-1
- Updates version to 0.8.8
- Fix nominal "tqt" typos and fix slow DVB start. [Bug #729, #899]
- Change location where Kaffeine stores temporary pipe files from $HOME to the more appropriate $KDEHOME/tmp-$HOSTNAME.
- Work around Xine crash when displaying still logo image by creating a small movie file to replace it [Bug #511, #559]
- Add man page
* Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.6-2
- Disable 'libxcb-devel' for RHEL 5 compilation
- Fix HTML directory location
* Wed Nov 09 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.6-1
- Spec file based on Fedora 8 'kaffeine-0.8.6-3'

1
redhat/applications/kaffeine/kaffeine.1
Unescape View File

@ -1 +0,0 @@
../../../ubuntu/maverick/applications/kaffeine/debian/kaffeine.1

14
redhat/applications/kasablanca/kasablanca-14.0.0-fix_ftp.patch → redhat/applications/kasablanca/kasablanca-14.0.0.patch
Unescape View File

@ -11,3 +11,17 @@
string buffer, filestring;
FILE* dirfile;
diff --git a/src/Makefile.am b/src/Makefile.am
index 0b6b597..8cf8cb2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,8 +25,7 @@ kasablanca_LDFLAGS = $(TDE_RPATH) $(all_libraries)
kasablanca_LDADD = -lssl $(LIB_TDEUI) -lcrypto $(LIB_TDECORE) -lDCOP $(LIB_QT)
# this is where the desktop file will go
-shelldesktopdir = $(kde_appsdir)/Utilities
-shelldesktop_DATA = kasablanca.desktop
+xdg_apps_DATA = kasablanca.desktop
# this is where the shell's XML-GUI resource file goes
shellrcdir = $(kde_datadir)/kasablanca

103
redhat/applications/kasablanca/kasablanca-14.0.0.spec
Unescape View File

@ -1,50 +1,85 @@
# 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
# Default version for this component
%define tde_pkg kasablanca
#
# spec file for package kasablanca (version R14.0.0)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
#
# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
#
# TDE variables
%define tde_epoch 2
%define tde_version 14.0.0
# TDE specific building variables
%define tde_pkg kasablanca
%define tde_prefix /opt/trinity
%define tde_appdir %{tde_datadir}/applications
%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 tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-%{tde_pkg}
Summary: Graphical FTP client
Epoch: %{tde_epoch}
Version: 0.4.0.2
Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Url: http://kasablanca.berlios.de/
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Summary: Graphical FTP client for Trinity
Group: Applications/Internet
Url: http://kasablanca.berlios.de/
%if 0%{?suse_version}
License: GPL-2.0+
%else
License: GPLv2+
%endif
#Vendor: Trinity Desktop
#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch1: kasablanca-14.0.0-fix_ftp.patch
Patch0: %{tde_pkg}-%{tde_version}.patch
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: autoconf automake libtool m4
BuildRequires: gcc-c++
BuildRequires: pkgconfig
# SUSE desktop files utility
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
%if 0%{?opensuse_bs} && 0%{?suse_version}
# for xdg-menu script
BuildRequires: brp-check-trinity
%endif
# OPENSSL support
BuildRequires: openssl-devel
# UTEMPTER support
%if 0%{?suse_version}
BuildRequires: utempter-devel
%else
@ -65,14 +100,18 @@ Kasablanca is an ftp client, among its features are currently:
* small nifty features, like a skiplist.
%if 0%{?suse_version} || 0%{?pclinuxos}
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
##########
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch1 -p1 -b .ftpthread
%patch0 -p1 -b .orig
%__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"
@ -82,7 +121,6 @@ Kasablanca is an ftp client, among its features are currently:
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
## Needed(?) for older/legacy setups, harmless otherwise
if pkg-config openssl ; then
@ -116,6 +154,11 @@ export PATH="%{tde_bindir}:${PATH}"
# locale's
%find_lang %{tde_pkg}
# Fix desktop files (openSUSE only)
%if 0%{?suse_version}
%suse_update_desktop_file kasablanca Network FileTransfer
%endif
%clean
%__rm -rf $RPM_BUILD_ROOT
@ -144,19 +187,9 @@ gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || :
%{tde_datadir}/config.kcfg/kbconfig.kcfg
%{tde_datadir}/icons/hicolor/*/apps/kasablanca.png
%{tde_tdedocdir}/HTML/en/kasablanca/
%{tde_datadir}/applnk/Utilities/kasablanca.desktop
%{tde_tdeappdir}/kasablanca.desktop
%changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.0.2-4
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.4.0.2-1
- Initial release for TDE 14.0.0
* Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.0.2-3
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.0.2-2
- Initial release for TDE 3.5.13.1
* Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.0.2-1
- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
- Based on Fedora 12 Spec 'kasablanca-0.4.0.2-17'

Write Preview
Loading…
Cancel
Save