diff options
Diffstat (limited to 'redhat/applications/k9copy')
10 files changed, 406 insertions, 48 deletions
diff --git a/redhat/applications/k9copy/k9copy-3.5.13-fix_another_string_format_error.patch b/redhat/applications/k9copy/k9copy-3.5.13-fix_another_string_format_error.patch new file mode 100644 index 000000000..e9b026778 --- /dev/null +++ b/redhat/applications/k9copy/k9copy-3.5.13-fix_another_string_format_error.patch @@ -0,0 +1,19 @@ +commit b3bb8a8f4438bdab23809387e9f6b85a5b5914f3 +Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Date: 1336103211 -0500 + + Fix another string format error + +diff --git a/libk9copy/k9saveimage.cpp b/libk9copy/k9saveimage.cpp +index edc4162..23613d8 100644 +--- a/libk9copy/k9saveimage.cpp ++++ b/libk9copy/k9saveimage.cpp +@@ -76,7 +76,7 @@ void k9SaveImage::run() { + TQString sFileName=m_tempFile->name(); + m_image.save(sFileName,"PNG"); + sFileName="\rINFOIMAGE:"+sFileName; +- fprintf(stderr,sFileName.utf8()); ++ fprintf(stderr,"%s",sFileName.utf8()); + + m_mutex.unlock(); + } diff --git a/redhat/applications/k9copy/k9copy-3.5.13-fix_format_not_string_literal.patch b/redhat/applications/k9copy/k9copy-3.5.13-fix_format_not_string_literal.patch new file mode 100644 index 000000000..db4c99a63 --- /dev/null +++ b/redhat/applications/k9copy/k9copy-3.5.13-fix_format_not_string_literal.patch @@ -0,0 +1,53 @@ +commit 3bfc84b0fc3558c377e2f5a99548a6903a9ee7c3 +Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Date: 1336066302 -0500 + + Fix 'format not a string literal' error + Clean up warning + +diff --git a/libk9copy/k9burndvd.cpp b/libk9copy/k9burndvd.cpp +index e6f6675..9f95352 100644 +--- a/libk9copy/k9burndvd.cpp ++++ b/libk9copy/k9burndvd.cpp +@@ -112,7 +112,7 @@ void k9BurnDVD::mkisoSizeStdout(KProcess *proc, char *buffer, int buflen) { + ; + } + +-const TQString &k9BurnDVD::getImageSize() { ++const TQString k9BurnDVD::getImageSize() { + TQString c; + c="mkisofs"; + proc2=new k9Process; +@@ -215,8 +215,8 @@ void k9BurnDVD::burnWithGenisoimage() { + if ( KMessageBox::warningContinueCancel ( 0,i18n("Insert a recordable DVD"), i18n("DVD burning"))!=KMessageBox::Continue) + cancelled=true; + } +- qDebug(proc->debug()); +- } ++ qDebug("%s", proc->debug()); ++ } + + + if (!cancelled) { +@@ -239,7 +239,7 @@ void k9BurnDVD::burnWithGenisoimage() { + } + } + } +- } ++ } + } + } + +diff --git a/libk9copy/k9burndvd.h b/libk9copy/k9burndvd.h +index fc2edce..94e1e71 100644 +--- a/libk9copy/k9burndvd.h ++++ b/libk9copy/k9burndvd.h +@@ -71,7 +71,7 @@ private: + void getWodimCmd(k9Process *proc); + + void burnWithK3b(); +- const TQString &getImageSize(); ++ const TQString getImageSize(); + TQString imageSize; + TQString m_speed; + private slots: // Private slots diff --git a/redhat/applications/k9copy/k9copy-3.5.13-fix_format_not_string_literal_2.patch b/redhat/applications/k9copy/k9copy-3.5.13-fix_format_not_string_literal_2.patch new file mode 100644 index 000000000..561bcbb22 --- /dev/null +++ b/redhat/applications/k9copy/k9copy-3.5.13-fix_format_not_string_literal_2.patch @@ -0,0 +1,23 @@ +commit d9ed8b3291e596eafed777956a062dc8816d0d3c +Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Date: 1336083386 -0500 + + Fix 'format not a string literal' error + +diff --git a/libk9copy/k9cellcopylist.cpp b/libk9copy/k9cellcopylist.cpp +index be4e406..31e85a3 100644 +--- a/libk9copy/k9cellcopylist.cpp ++++ b/libk9copy/k9cellcopylist.cpp +@@ -294,10 +294,10 @@ double k9CellCopyList::getMinFactor(bool _withMenus) { + double totalSize=gettotalSize()+menuSize - (fforced) -m_inbytes; + totalSize/=2.50; + +-qDebug(TQString("totalSize(%1)=gettotalSize()(%2)+menuSize(%3) -(fforced(%4))-m_inbytes(%6)").tqarg(totalSize).tqarg(gettotalSize()).tqarg(menuSize).tqarg(fforced).tqarg(m_frcinbytes).tqarg(m_inbytes)); ++ qDebug("%s", (TQString("totalSize(%1)=gettotalSize()(%2)+menuSize(%3) -(fforced(%4))-m_inbytes(%6)").tqarg(totalSize).tqarg(gettotalSize()).tqarg(menuSize).tqarg(fforced).tqarg(m_frcinbytes).tqarg(m_inbytes)).ascii()); + + double minFactor=(fforced-m_frcinbytes) /(MaxSize- (totalSize +m_outbytes) - m_frcoutbytes) ; +- qDebug(TQString("minfactor(%1)=(fforced(%2) -m_frinbytes(%3))/(MacSize(%4)-totalSize(%5)-m_outbytes(%6) - m_frcoutbytes(%7))").tqarg(minFactor).tqarg(fforced).tqarg(m_frcinbytes).tqarg(MaxSize).tqarg(totalSize).tqarg(m_outbytes).tqarg(m_frcoutbytes)); ++ qDebug("%s", (TQString("minfactor(%1)=(fforced(%2) -m_frinbytes(%3))/(MacSize(%4)-totalSize(%5)-m_outbytes(%6) - m_frcoutbytes(%7))").tqarg(minFactor).tqarg(fforced).tqarg(m_frcinbytes).tqarg(MaxSize).tqarg(totalSize).tqarg(m_outbytes).tqarg(m_frcoutbytes)).ascii()); + + if (minFactor<1) + minFactor=1; diff --git a/redhat/applications/k9copy/k9copy-3.5.13-fix_format_string_error.patch b/redhat/applications/k9copy/k9copy-3.5.13-fix_format_string_error.patch new file mode 100644 index 000000000..7ab4962e0 --- /dev/null +++ b/redhat/applications/k9copy/k9copy-3.5.13-fix_format_string_error.patch @@ -0,0 +1,28 @@ +commit a016df82c8970a2aaccbf3b061e102af3a3f04ab +Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Date: 1336190259 -0500 + + Fix format string error + +diff --git a/k9vamps/k9vamps.cpp b/k9vamps/k9vamps.cpp +index d7bd43d..ebf4164 100755 +--- a/k9vamps/k9vamps.cpp ++++ b/k9vamps/k9vamps.cpp +@@ -399,7 +399,7 @@ int k9vamps::check_video_packet (uchar *ptr) { + pad_packet_start_code |= (uint32_t) (ptr [3]); + + if (pad_packet_start_code != 0x000001be) +- qDebug (TQString("Bad padding packet start code at %1: %2").tqarg(rtell (ptr + vid_packet_length)).tqarg(pad_packet_start_code)); ++ qDebug ("%s", (TQString("Bad padding packet start code at %1: %2").tqarg(rtell (ptr + vid_packet_length)).tqarg(pad_packet_start_code)).ascii()); + else { + pad_packet_length = ptr [4] << 8; + pad_packet_length |= ptr [5]; +@@ -409,7 +409,7 @@ int k9vamps::check_video_packet (uchar *ptr) { + + // length of video packet plus padding packet must always match sector size + if (14 + vid_packet_length + pad_packet_length != SECT_SIZE) +- qDebug (TQString("Bad video packet length at %1: %2").tqarg(rtell (ptr)).tqarg(vid_packet_length)); ++ qDebug ("%s", (TQString("Bad video packet length at %1: %2").tqarg(rtell (ptr)).tqarg(vid_packet_length)).ascii()); + + return rc; + } diff --git a/redhat/applications/k9copy/k9copy-3.5.13-fix_ftbfs.patch b/redhat/applications/k9copy/k9copy-3.5.13-fix_ftbfs.patch new file mode 100644 index 000000000..f6dc49802 --- /dev/null +++ b/redhat/applications/k9copy/k9copy-3.5.13-fix_ftbfs.patch @@ -0,0 +1,19 @@ +commit 62acebb74cc50671eebf21a314912b12b082be1d +Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Date: 1336073612 -0500 + + Fix FTBFS + +diff --git a/libk9copy/k9burndvd.cpp b/libk9copy/k9burndvd.cpp +index 9f95352..3860b79 100644 +--- a/libk9copy/k9burndvd.cpp ++++ b/libk9copy/k9burndvd.cpp +@@ -215,7 +215,7 @@ void k9BurnDVD::burnWithGenisoimage() { + if ( KMessageBox::warningContinueCancel ( 0,i18n("Insert a recordable DVD"), i18n("DVD burning"))!=KMessageBox::Continue) + cancelled=true; + } +- qDebug("%s", proc->debug()); ++ qDebug("%s", proc->debug().ascii()); + } + + diff --git a/redhat/applications/k9copy/k9copy-3.5.13-fix_ftbfs_2.patch b/redhat/applications/k9copy/k9copy-3.5.13-fix_ftbfs_2.patch new file mode 100644 index 000000000..f78d858df --- /dev/null +++ b/redhat/applications/k9copy/k9copy-3.5.13-fix_ftbfs_2.patch @@ -0,0 +1,19 @@ +commit ca864edeed0fe99b91c63616d4ec6d31ecdee217 +Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Date: 1336121912 -0500 + + Fix FTBFS + +diff --git a/libk9copy/k9saveimage.cpp b/libk9copy/k9saveimage.cpp +index 23613d8..758f8de 100644 +--- a/libk9copy/k9saveimage.cpp ++++ b/libk9copy/k9saveimage.cpp +@@ -76,7 +76,7 @@ void k9SaveImage::run() { + TQString sFileName=m_tempFile->name(); + m_image.save(sFileName,"PNG"); + sFileName="\rINFOIMAGE:"+sFileName; +- fprintf(stderr,"%s",sFileName.utf8()); ++ fprintf(stderr,"%s",sFileName.data()); + + m_mutex.unlock(); + } diff --git a/redhat/applications/k9copy/k9copy-3.5.13-fix_remaining_string_format_errors.patch b/redhat/applications/k9copy/k9copy-3.5.13-fix_remaining_string_format_errors.patch new file mode 100644 index 000000000..fbf9cd56a --- /dev/null +++ b/redhat/applications/k9copy/k9copy-3.5.13-fix_remaining_string_format_errors.patch @@ -0,0 +1,150 @@ +commit a8e98ad9ce209af0aba35ce26ec9200761b397df +Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Date: 1336091322 -0500 + + Fix remaining string format errors + +diff --git a/k9author/k9menu.cpp b/k9author/k9menu.cpp +index 29f2b02..ea9c622 100644 +--- a/k9author/k9menu.cpp ++++ b/k9author/k9menu.cpp +@@ -143,7 +143,7 @@ void k9Menu::convertJpegToMpeg(const TQString &_imageJpg,const TQString &_imageM + if (!process->normalExit()) { + qDebug("error converting jpeg to mpeg"); + } +- qDebug(process->debug().latin1()); ++ qDebug("%s", process->debug().latin1()); + } + + void k9Menu::createAudio(const TQString & _audioFile) { +diff --git a/k9author/k9newdvd.cpp b/k9author/k9newdvd.cpp +index a2c02e7..454099e 100644 +--- a/k9author/k9newdvd.cpp ++++ b/k9author/k9newdvd.cpp +@@ -257,7 +257,7 @@ void k9NewDVD::createMencoderCmd(TQString &_cmd,TQString &_chapters, k9AviFile * + *process << "-mpegopts" << "format=dvd" << "-vf" << "scale="+scale+",harddup" << "-srate" << "48000" << "-af" << "lavcresample=48000"; + *process << "-lavcopts" << TQString("vcodec=mpeg2video:vrc_buf_size=1835:vrc_maxrate=9800:vbitrate=%1:keyint=15:acodec=%3:abitrate=%2:aspect=16/9").tqarg(m_videoBitrate).tqarg(m_config->getPrefAudioBitrate()).tqarg(m_config->getPrefAudioFormat().lower()); + *process << "-ofps" << fps << "-o" << fileName << "-ss" << t1 << "-endpos" << t2 << _aviFile->getFileName(); +- qDebug(process->debug()); ++ qDebug("%s", process->debug().ascii()); + /* + if (!m_progress->execute()) { + m_cancel=true; +diff --git a/k9devices/k9halconnection.cpp b/k9devices/k9halconnection.cpp +index 76c6882..e55c0b3 100644 +--- a/k9devices/k9halconnection.cpp ++++ b/k9devices/k9halconnection.cpp +@@ -41,7 +41,7 @@ k9HalConnection::k9HalConnection(TQObject *parent, const char *name) + dbus_error_init( &error ); + m_dbusConnect = dbus_bus_get( DBUS_BUS_SYSTEM, &error ); + if( dbus_error_is_set(&error) ) { +- qDebug(TQString("Error connecting to DBUS : %1").tqarg(error.message)); ++ qDebug("%s", (TQString("Error connecting to DBUS : %1").tqarg(error.message)).ascii()); + return; + } + +diff --git a/k9devices/k9haldevice.cpp b/k9devices/k9haldevice.cpp +index 9ddff76..0129efe 100644 +--- a/k9devices/k9haldevice.cpp ++++ b/k9devices/k9haldevice.cpp +@@ -95,7 +95,7 @@ void k9HalDevice::getDriveProperties() { + m_canReadDvd=(caps & LIBHAL_DRIVE_CDROM_CAPS_DVDROM)==LIBHAL_DRIVE_CDROM_CAPS_DVDROM; + m_canBurnDvd=(caps & LIBHAL_DRIVE_CDROM_CAPS_DVDR)==LIBHAL_DRIVE_CDROM_CAPS_DVDR; + m_model=TQString(libhal_drive_get_model(drive)); +- // qDebug(TQString("canReadDvd:%1 canBurnDvd:%2 model:%3").tqarg(m_canReadDvd).tqarg(m_canBurnDvd).tqarg(m_model)); ++ // qDebug("%s", (TQString("canReadDvd:%1 canBurnDvd:%2 model:%3").tqarg(m_canReadDvd).tqarg(m_canBurnDvd).tqarg(m_model)).ascii()); + + + libhal_drive_free(drive); +diff --git a/k9vamps/k9vamps.cpp b/k9vamps/k9vamps.cpp +index f910979..d7bd43d 100755 +--- a/k9vamps/k9vamps.cpp ++++ b/k9vamps/k9vamps.cpp +@@ -368,7 +368,7 @@ int k9vamps::check_video_packet (uchar *ptr) { + + if (ptr [7]) { + if ((ptr [7] & 0xc0) != 0xc0) +- qDebug (TQString("First video packet in sequence starting at %1 misses PTS or DTS, flags=%2").tqarg(rtell (ptr)).tqarg(ptr [7])); ++ qDebug ("%s", (TQString("First video packet in sequence starting at %1 misses PTS or DTS, flags=%2").tqarg(rtell (ptr)).tqarg(ptr [7])).ascii()); + else { + sequence_header_code = (uint32_t) (ptr [6 + 3 + ptr [8] + 0]) << 24; + sequence_header_code |= (uint32_t) (ptr [6 + 3 + ptr [8] + 1]) << 16; +diff --git a/libk9copy/k9cellcopylist.cpp b/libk9copy/k9cellcopylist.cpp +index 31e85a3..fe880ac 100644 +--- a/libk9copy/k9cellcopylist.cpp ++++ b/libk9copy/k9cellcopylist.cpp +@@ -298,7 +298,7 @@ double k9CellCopyList::getMinFactor(bool _withMenus) { + + double minFactor=(fforced-m_frcinbytes) /(MaxSize- (totalSize +m_outbytes) - m_frcoutbytes) ; + qDebug("%s", (TQString("minfactor(%1)=(fforced(%2) -m_frinbytes(%3))/(MacSize(%4)-totalSize(%5)-m_outbytes(%6) - m_frcoutbytes(%7))").tqarg(minFactor).tqarg(fforced).tqarg(m_frcinbytes).tqarg(MaxSize).tqarg(totalSize).tqarg(m_outbytes).tqarg(m_frcoutbytes)).ascii()); +- ++ + if (minFactor<1) + minFactor=1; + return minFactor; +@@ -347,7 +347,7 @@ double k9CellCopyList::getfactor(bool _withMenus,bool _streams) { + + if (dvdSize2 <0) { + factor=2.5; +- //qDebug(TQString("dvdSize (%1)- _outbytes(%2) - fforcedsh(%3)=%4").tqarg(dvdSize).tqarg(m_outbytes).tqarg(fforcedsh).tqarg(dvdSize2)); ++ //qDebug("%s", (TQString("dvdSize (%1)- _outbytes(%2) - fforcedsh(%3)=%4").tqarg(dvdSize).tqarg(m_outbytes).tqarg(fforcedsh).tqarg(dvdSize2).ascii())); + } + else { + factor=(totalSize +menuSize - fforced -m_inbytes)/ dvdSize2 ; +@@ -361,7 +361,7 @@ double k9CellCopyList::getfactor(bool _withMenus,bool _streams) { + uint64_t i=m_inbytes; + //if (o==0) + // o=1; +- //qDebug(TQString("factor : %1 realise : %2").tqarg(factor).tqarg((double)i/(double)o)); ++ //qDebug("%s", (TQString("factor : %1 realise : %2").tqarg(factor).tqarg((double)i/(double)o).ascii())); + + if (factor<=1) + factor=1; +diff --git a/libk9copy/k9dvdauthor.cpp b/libk9copy/k9dvdauthor.cpp +index 3676109..256cf53 100755 +--- a/libk9copy/k9dvdauthor.cpp ++++ b/libk9copy/k9dvdauthor.cpp +@@ -505,7 +505,7 @@ void k9DVDAuthor::DVDAuthorStderr(KProcess *proc, char *buffer, int buflen ) { + // m_copied+=totalBytes - m_lastPos; + m_copied=totalBytes; + m_lastPos=totalBytes; +- //qDebug(TQString("copied : %1 totalSize : %2").tqarg(m_copied).tqarg(m_totalSize*512)); ++ //qDebug("%s", (TQString("copied : %1 totalSize : %2").tqarg(m_copied).tqarg(m_totalSize*512).ascii()); + m_percent=(float)m_copied / (float)(m_totalSize/DVD_VIDEO_LB_LEN ); + + +@@ -526,7 +526,7 @@ void k9DVDAuthor::DVDAuthorStderr(KProcess *proc, char *buffer, int buflen ) { + } + /* else { + if (!m_stderr.startsWith("libdvdread") && m_stderr.startsWith("libdvdnav")) +- qDebug(m_stderr); ++ qDebug("%s", m_stderr.ascii()); + } + */ + int end; +diff --git a/libk9copy/k9ifo2.cpp b/libk9copy/k9ifo2.cpp +index 57643c4..8c73213 100644 +--- a/libk9copy/k9ifo2.cpp ++++ b/libk9copy/k9ifo2.cpp +@@ -870,7 +870,7 @@ void k9Ifo2::checkBuffer(TQString lib,uchar* _buffer) { + if (memcmp(bufCopy,_buffer,bufCopySize)!=0) { + TQString c; + c="Buffer de sortie altéré: " +lib; +- qDebug(c.latin1()); ++ qDebug("%s", c.latin1()); + } + } + +diff --git a/libk9copy/k9mp4enc.cpp b/libk9copy/k9mp4enc.cpp +index e29f206..0f4aaca 100644 +--- a/libk9copy/k9mp4enc.cpp ++++ b/libk9copy/k9mp4enc.cpp +@@ -392,7 +392,7 @@ void k9MP4Enc::execute ( k9DVDTitle *_title ) + TQCString str=* ( m_process->args().at ( i ) ); + s +=TQString ( str ) +" "; + } +- qDebug ( s ); ++ qDebug ( "%s", s.ascii() ); + time->start(); + m_timer3.start(); + connect ( m_process, TQT_SIGNAL ( receivedStdout ( KProcess *, char *, int ) ),this, TQT_SLOT ( getStdout ( KProcess *, char *, int ) ) ); diff --git a/redhat/applications/k9copy/k9copy-3.5.13-ftbfs.patch b/redhat/applications/k9copy/k9copy-3.5.13-ftbfs.patch deleted file mode 100644 index 67c2464cd..000000000 --- a/redhat/applications/k9copy/k9copy-3.5.13-ftbfs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nuar k9copy.ORI/src/Makefile.am k9copy.P/src/Makefile.am ---- k9copy.ORI/src/Makefile.am 2011-11-21 00:08:57.943296860 +0100 -+++ k9copy.P/src/Makefile.am 2011-11-21 00:18:50.559281008 +0100 -@@ -30,7 +30,7 @@ - kconfigdlg.cpp kviewmpeg2.cpp kviewmpeg2.h langselectw.ui main.cpp mencoderCmdGen.ui \ - playbackoptionsw.ui prefAuthor.ui prefDVD.ui prefMPEG4.ui prefMencoder.ui prefpreview.ui \ - titlefactor.ui viewmpeg2.ui --k9copy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) -+k9copy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) $(LIBDL) - k9copy_LDADD = $(top_builddir)/k9Mplayer/libk9mplayer.la \ - $(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \ - $(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \ diff --git a/redhat/applications/k9copy/k9copy-3.5.13-missing_ldflags.patch b/redhat/applications/k9copy/k9copy-3.5.13-missing_ldflags.patch new file mode 100644 index 000000000..3cce7ea00 --- /dev/null +++ b/redhat/applications/k9copy/k9copy-3.5.13-missing_ldflags.patch @@ -0,0 +1,11 @@ +--- k9copy/src/Makefile.am.ldflags 2011-10-15 01:43:52.000000000 +0200 ++++ k9copy/src/Makefile.am 2012-08-04 17:40:13.574823034 +0200 +@@ -35,7 +35,7 @@ + $(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \ + $(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \ + $(top_builddir)/libdvdnav/libk9dvdnav.la $(top_builddir)/libk9copy/libk9copy.la \ +- $(top_builddir)/dvdread/libdvdread.la $(LIB_KDEUI) -lkmdi ++ $(top_builddir)/dvdread/libdvdread.la $(LIB_KDEUI) -lkmdi $(LIBDL) + + # this is where the desktop file will go + shelldesktopdir = $(kde_appsdir)/Utilities diff --git a/redhat/applications/k9copy/trinity-k9copy.spec b/redhat/applications/k9copy/trinity-k9copy.spec index d56c14c08..ad0f6f317 100644 --- a/redhat/applications/k9copy/trinity-k9copy.spec +++ b/redhat/applications/k9copy/trinity-k9copy.spec @@ -1,25 +1,32 @@ # Default version for this component %define kdecomp k9copy -%define version 1.2.3 -%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc %endif -# TDE 3.5.12 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/trinity +# 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_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/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: DVD backup tool for Trinity -Version: %{?version} -Release: %{?release}%{?dist}%{?_variant} +Version: 1.2.3 +Release: 2%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -28,18 +35,35 @@ Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> URL: http://www.trinitydesktop.org/ -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz -Patch0: k9copy-3.5.13-ftbfs.patch + +# [k9copy] Missing LDFLAGS cause FTBFS +Patch0: k9copy-3.5.13-missing_ldflags.patch +# [k9copy] Fix 'format not a string literal' error. Clean up warning. [Commit #3bfc84b0] +Patch1: k9copy-3.5.13-fix_format_not_string_literal.patch +# [k9copy] Fix FTBFS [Commit #62acebb7] +Patch2: k9copy-3.5.13-fix_ftbfs.patch +# [k9copy] Fix 'format not a string literal' error [Commit #d9ed8b32] +Patch3: k9copy-3.5.13-fix_format_not_string_literal_2.patch +# [k9copy] Fix remaining string format errors [Commit #a8e98ad9] +Patch4: k9copy-3.5.13-fix_remaining_string_format_errors.patch +# [k9copy] Fix another string format error [Commit #b3bb8a8f] +Patch5: k9copy-3.5.13-fix_another_string_format_error.patch +# [k9copy] Fix FTBFS [Commit #ca864ede] +Patch6: k9copy-3.5.13-fix_ftbfs_2.patch +# [k9copy] Fix format string error [Commit #a016df82] +Patch7: k9copy-3.5.13-fix_format_string_error.patch BuildRequires: tqtinterface-devel -BuildRequires: trinity-kdelibs-devel -BuildRequires: trinity-kdebase-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel BuildRequires: desktop-file-utils -BuildRequires: ffmpeg-devel +# Warning: the target distribution must have ffmpeg ! +BuildRequires: ffmpeg-devel Requires: ffmpeg %description @@ -50,13 +74,20 @@ This is the Trinity version %prep %setup -q -n applications/%{kdecomp} -%patch0 -p1 +%patch0 -p1 -b .ldflags +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -65,19 +96,24 @@ This is the Trinity version %build -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ - --disable-rpath \ - --with-extra-includes=%{_includedir}/tqt \ - --enable-closure + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --datadir=%{tde_datadir} \ + --disable-rpath \ + --with-extra-includes=%{tde_includedir}/tqt \ + --enable-closure %__make %{?_smp_mflags} %install -export PATH="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} @@ -88,26 +124,38 @@ export PATH="%{_bindir}:${PATH}" %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : +update-desktop-database %{tde_appdir} &> /dev/null %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : +update-desktop-database %{tde_appdir} &> /dev/null %files -f %{kdecomp}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING -%{_bindir}/k9copy -%{_datadir}/applications/kde/k9copy.desktop -%{_datadir}/apps/k9copy -%{_datadir}/apps/konqueror/servicemenus/k9copy_open.desktop -%{tde_docdir}/HTML/en/k9copy -%{_datadir}/icons/hicolor/*/apps/k9copy.png +%{tde_bindir}/k9copy +%{tde_tdeappdir}/k9copy.desktop +%{tde_datadir}/apps/k9copy/ +%{tde_datadir}/apps/konqueror/servicemenus/k9copy_open.desktop +%lang(en) %{tde_tdedocdir}/HTML/en/k9copy/ +%{tde_datadir}/icons/hicolor/*/apps/k9copy.png %Changelog +* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.3-2 +- Add support for MGA2 and MDV2011 +- Fix 'format not a string literal' error. Clean up warning. [Commit #3bfc84b0] +- Fix FTBFS [Commit #62acebb7] +- Fix 'format not a string literal' error [Commit #d9ed8b32] +- Fix remaining string format errors [Commit #a8e98ad9] +- Fix another string format error [Commit #b3bb8a8f] +- Fix FTBFS [Commit #ca864ede] +- Fix format string error [Commit #a016df82] + * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.2.3-2 - Fix HTML directory location |