Request 212 (accepted)

Overview

Request 212 (accepted)

fix build on 12.1 and later, remove builddate

Created by seife over 11 years ago
In state accepted

Submit qdvdauthor

Submit package home:seife:branches:Multimedia / qdvdauthor to package Multimedia / qdvdauthor

qdvdauthor.changes Changed

qdvdauthor.spec Changed

fix-build-os121.patch Changed

qdvdauthor-gcc47.patch Added

@@ -0,0 +1,48 @@
+Index: b/qdvdauthor/render_client.cpp
+===================================================================
+--- a/qdvdauthor/render_client.cpp
++++ b/qdvdauthor/render_client.cpp
+@@ -30,10 +30,11 @@
+ 
+ #include <math.h>
+ #include <stdlib.h>
+ #include <arpa/inet.h>
+ #include <sys/stat.h>
++#include <unistd.h>
+ 
+ #include <qdir.h>
+ #include <qfile.h>
+ #include <qimage.h>
+ #include <qtimer.h>
+Index: b/qdvdauthor/oneclickwizard.cpp
+===================================================================
+--- a/qdvdauthor/oneclickwizard.cpp
++++ b/qdvdauthor/oneclickwizard.cpp
+@@ -7,10 +7,11 @@
+ ** License : GPL v 2.0
+ **
+ *****************************************************************************/
+ #include <stdlib.h> 
+ #include <dlfcn.h>
++#include <unistd.h>
+ 
+ #include <qdir.h>
+ #include <qframe.h>
+ #include <qlabel.h>
+ #include <qimage.h>
+Index: b/qdvdauthor/dialogslideshow.cpp
+===================================================================
+--- a/qdvdauthor/dialogslideshow.cpp
++++ b/qdvdauthor/dialogslideshow.cpp
+@@ -6,10 +6,11 @@
+ ** Copyright : (c) Varol Okan
+ ** License : GPL v 2.0
+ **
+ *****************************************************************************/
+ 
++#include <unistd.h>
+ #include <qlabel.h>
+ #include <qimage.h>
+ #include <qtimer.h>
+ #include <qpixmap.h>
+ #include <qcursor.h>

qdvdauthor-remove-builddate.patch Added

@@ -0,0 +1,128 @@
+Index: b/qdvdauthor/main.cpp
+===================================================================
+--- a/qdvdauthor/main.cpp
++++ b/qdvdauthor/main.cpp
+@@ -39,11 +39,11 @@
+ 
+ void displayHelp ()
+ {
+ printf ("qdvdauthor -k -d -p -x -o -h\n"
+ 	 "Copyrighted 2003-2007 by Varol Okan\n"
+-	 "Built " __DATE__ "\n\n"
++	 "Built in the Packman Buildservice\n\n"
+ 	 "-k <inputFile> This option allows you to import a kino smil file.\n"
+ 	 "-d <inputFile> This option allows you to import a dvdauthor.xml file.\n"
+ 	 "-s <File1 File2 ... FileN> This option allows you to import spumux.xml file(s).\n"
+ 	 "-p <inputFile> This option allows you to open a 'Q' DVD-Author project file.\n"
+ 	 "-o <outputFile> This option exports the generated 'Q' DVD-Author project file.\n"
+Index: b/addons/jhead/jhead.c
+===================================================================
+--- a/addons/jhead/jhead.c
++++ b/addons/jhead/jhead.c
+@@ -1442,11 +1442,11 @@ int main (int argc, char **argv)
+ }else if (!strcmp(arg,"-v")){
+ ShowTags = TRUE;
+ }else if (!strcmp(arg,"-q")){
+ Quiet = TRUE;
+ }else if (!strcmp(arg,"-V")){
+- printf("Jhead version: "JHEAD_VERSION" Compiled: "__DATE__"\n");
++ printf("Jhead version: "JHEAD_VERSION"\n");
+ exit(0);
+ }else if (!strcmp(arg,"-exifmap")){
+ DumpExifMap = TRUE;
+ }else if (!strcmp(arg,"-se")){
+ SupressNonFatalErrors = TRUE;
+Index: b/qdvdauthor/qdvdauthor.cpp
+===================================================================
+--- a/qdvdauthor/qdvdauthor.cpp
++++ b/qdvdauthor/qdvdauthor.cpp
+@@ -1517,11 +1517,11 @@ void QDVDAuthor::slotFeedback ()
+ qsBashScript += QString ("mplayer -vo help -ao help >> %1/system.txt\n").arg( qsFeedbackDir );
+ qsBashScript += QString ("echo PREFIX_DIRECTORY="PREFIX_DIRECTORY" >> %1/system.txt\n").arg( qsFeedbackDir );
+ qsBashScript += QString ("echo SYSTEM_DIRECTORY="SYSTEM_DIRECTORY" >> %1/system.txt\n").arg( qsFeedbackDir );
+ qsBashScript += QString ("echo Global::qsSystemPath="+ Global::qsSystemPath +" >> %1/system.txt\n").arg( qsFeedbackDir );
+ qsBashScript += QString ("echo \"QDVDAuthorVersionNumber="QDVDAUTHOR_VERSION_NUMBER"\" >> %1/system.txt\n").arg ( qsFeedbackDir );
+- qsBashScript += QString ("echo \"Build ("__DATE__")\" >> %1/system.txt\n").arg ( qsFeedbackDir );
++// qsBashScript += QString ("echo \"Build ("__DATE__")\" >> %1/system.txt\n").arg ( qsFeedbackDir );
+ qsBashScript += QString ("cd \"%1/%2/\"\n").arg(Global::qsTempPath).arg(Global::qsProjectName);
+ qsBashScript += QString ("cp \"%1/qrender/*.txt\" \"%2\"\n").arg ( Global::qsTempPath ).arg ( qsFeedbackDir );
+ qsBashScript += QString ("cp ~/.qdvdauthor/*.ini \"%1\"\n").arg( qsFeedbackDir );
+ qsBashScript += QString ("cp ~/.qdvdauthor/autosave.xml \"%1\"\n").arg( qsFeedbackDir );
+ qsBashScript += QString ("cp \"%1\" \"%2\" 2> /dev/null\n").arg(Global::qsProjectFileName).arg( qsFeedbackDir );
+@@ -2184,11 +2184,11 @@ void QDVDAuthor::helpAbout()
+ QString qsAbout;
+ qsAbout = QString ("<h3>'Q' DVD-Author</h3>\n");
+ qsAbout += QString ( "By " );
+ qsAbout += QString ( "Varol Okan " );
+ qsAbout += QString ( " " );
+- qsAbout += QString ( "Ver: %1 (build:%2) " ).arg(QDVDAUTHOR_VERSION_NUMBER).arg(__DATE__);
++ qsAbout += QString ( "Ver: %1 " ).arg(QDVDAUTHOR_VERSION_NUMBER);
+ qsAbout += QString ("<a href=\"http://qdvdauthor.sourceforge.net\">http://qdvdauthor.sourceforge.net</a> ");
+ qsAbout += QString ("System Folder at %1/share/qdvdauthor/").arg ( Global::qsSystemPath );
+ uiDialogAbout dialogAbout (this);
+ dialogAbout.m_pLabelAbout->setText ( qsAbout );
+ dialogAbout.exec();
+Index: b/qdvdauthor/qrender/qrender.cpp
+===================================================================
+--- a/qdvdauthor/qrender/qrender.cpp
++++ b/qdvdauthor/qrender/qrender.cpp
+@@ -303,11 +303,11 @@ void QRender::parseCommandLine (int argc
+ 		if ((strcmp(pCurrentArgument, "--help") == 0) || (strcmp(pCurrentArgument, "-H") == 0) )	{
+ 			usage ();
+ 			return;
+ 		}
+ 		if ((strcmp(pCurrentArgument, "--version") == 0) || (strcmp(pCurrentArgument, "-v") == 0) )	{
+-			printf ("Version: QRender %s built date %s http://qdvdauthor.sf.net\n", QRENDER_VERSION, __DATE__);
++			printf ("Version: QRender %s http://qdvdauthor.sf.net\n", QRENDER_VERSION);
+ 			return;
+ 		}
+ 		else if ((strcmp(pCurrentArgument, "--verbose") == 0) || (strcmp(pCurrentArgument, "-V") == 0) )	{
+ 			m_iVerbosityLevel = QString (argv++t).toInt();
+ 		}
+@@ -390,11 +390,11 @@ void QRender::readXml (QString qsXmlFile
+ 	m_xmlQRender.readXml (qsXmlFile);
+ }
+ 
+ void QRender::usage ()
+ {
+-	printf ("Version: QRender %s built date %s http://qdvdauthor.sf.net\n", QRENDER_VERSION, __DATE__);
++	printf ("Version: QRender %s http://qdvdauthor.sf.net\n", QRENDER_VERSION);
+ 	printf ("Copyright: Copyright (C) 2005 Varol Okan\n\n");
+ 	
+ 	printf ("Usage: qrender options ... -i file options ... -i file ... options ... -o file\n\n");
+ 	
+ 	printf ("Options: \n\n");
+Index: b/qrender/parser.cpp
+===================================================================
+--- a/qrender/parser.cpp
++++ b/qrender/parser.cpp
+@@ -158,11 +158,11 @@ bool Parser::isTTY ( )
+ return m_bTTY;
+ }
+ 
+ void Parser::printHelp ( )
+ { //"it:o:p:"
+- printf ( "QRender version %s, built date %s\n", QRENDER_VERSION, __DATE__ );
++ printf ( "QRender version %s\n", QRENDER_VERSION );
+ printf ( "Part of QDVDAuthor: http://qdvdauthor.sf.net\n\n" );
+ 
+ // NOt yet ... For a future release.
+ // printf ( "qrender -hvt -p port -o FILE -ix|id FILE <... image files>\n" );
+ printf ( "qrender -hvt -p port -o FILE -ix FILE\n" );
+Index: b/qrender/render.cpp
+===================================================================
+--- a/qrender/render.cpp
++++ b/qrender/render.cpp
+@@ -85,11 +85,11 @@ Render::~Render ( )
+ void Render::run ( )
+ {
+ // Kick off the pinger ...
+ m_iTimerID = startTimer ( I_AM_ALIVE_INTERVAL );;
+ 
+- logger ( ).iLOG ( "%s Build date : %s\n", QRENDER_VERSION, __DATE__ );
++ logger ( ).iLOG ( "%s\n", QRENDER_VERSION );
+ status ( ).log ( "START\n" );
+ 
+ // Enter the TcpServers Event Loop to listen to events from the socket.
+ int iExec = -1;
+ while ( iExec != CLIENT_KILL_YOURSELF && ! m_bKillClient ) {

Build Results
RPM Lint

Refresh

Comments for request 212 0

Request History

seife created request over 11 years ago

fix build on 12.1 and later, remove builddate

seife accepted request over 12 years ago

fix build on 12.1 and later, remove builddate