diff options
11 files changed, 430 insertions, 679 deletions
diff --git a/multimedia/k9copy-reloaded/README b/multimedia/k9copy-reloaded/README index 2eea865949..3f2efa3d1e 100644 --- a/multimedia/k9copy-reloaded/README +++ b/multimedia/k9copy-reloaded/README @@ -12,12 +12,12 @@ They open just fine on 64-bit systems. NOTE 3: If you wish to build this on current (15.0 EXPERIMENTAL), you will need to pass CURRENT=yes to the script. -NOTE 4: This program is only intended for personal backups, and is NOT +NOTE 4: dvdauthor is listed as optional, but it is not necessary. +It crashes k9copy if you try to use it in current, but it works fine +in 14.2. It is disabled by default in settings. + +NOTE 5: This program is only intended for personal backups, and is NOT intended for copying of copyrighted commercial DVDs. Therefore, there is NO CSS decription libary included in this package. Requires libmpeg2 and ffmpeg (ffmpeg is already included in current). - -dvdauthor is optional. (The dvdauthor program crashes k9copy if you -try to use it in current, but it works fine in 14.2. It can be -disabled in settings.) diff --git a/multimedia/k9copy-reloaded/k9copy-reloaded.SlackBuild b/multimedia/k9copy-reloaded/k9copy-reloaded.SlackBuild index de7720bde0..4f1e30b823 100644 --- a/multimedia/k9copy-reloaded/k9copy-reloaded.SlackBuild +++ b/multimedia/k9copy-reloaded/k9copy-reloaded.SlackBuild @@ -5,9 +5,6 @@ # Copyright 2018, 2020 by Lenard Spencer (lenardrspencer@gmail.com) # All rights reserved. # -# ffmpeg static library section borrowed (stolen?) from xine-lib.SlackBuild -# from Slackware 14.2 source archives,copyrighted by Pat Volkerding, et. al. -# # Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: # @@ -29,7 +26,7 @@ PRGNAM=k9copy-reloaded SRCNAM=k9copy VERSION=${VERSION:-3.0.3} -BUILD=${BUILD:-5} +BUILD=${BUILD:-6} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -83,10 +80,29 @@ touch src/libdvdnav-NOW/dvdnav/CMakeLists.txt touch src/libdvdread-NOW/CMakeLists.txt touch src/libdvdread-NOW/dvdread/CMakeLists.txt -# patches from upstream and community: -patch -p1 < $CWD/patches/k9copy-reloaded-consolidated-fixes.patch +patch -p1 < $CWD/patches/k9copy-fix-desktop-files.patch +patch -p1 < $CWD/patches/k9copy-installdirs.patch +patch -p1 < $CWD/patches/k9copy-ffmpeg3.patch + +# from the Fedora community, MUCH better than the ill-conceived and +# BROKEN gcc6 patch that has been floating around the web: +patch -p1 < $CWD/patches/k9copy-gcc7.patch + +# There have been several attempts to remove the internal libdvdread +# and libdvdnav, but NONE of then work properly (the program builds, +# but the backups are corrupt and will not play). I may revisit it +# later, but for now, we must patch the internal dvdnav to properly +# link to the internal dvdread: +patch -p1 < $CWD/patches/k9copy-dvdnav.patch + +# In current, dvdauthor crashes the program if we try to use it +# for copy without menus, so we disable it by default in settings: +patch -p1 < $CWD/patches/k9copy-uncheck-dvdauthor.patch + +# Patch for missing "Language=" entry in .po files: +patch -p1 < $CWD/patches/k9copy-missing-language-in-po-files.patch -# Patch for i18n: +# Patch for i18n (mitigates I18N_ARGUMENT_MISSING messages: patch -p1 < $CWD/patches/k9copy-i18n.patch if [ "${CURRENT:-no}" = "yes" ];then diff --git a/multimedia/k9copy-reloaded/patches/k9copy-ffmpeg3.patch b/multimedia/k9copy-reloaded/patches/k9copy-ffmpeg3.patch new file mode 100644 index 0000000000..e01b562787 --- /dev/null +++ b/multimedia/k9copy-reloaded/patches/k9copy-ffmpeg3.patch @@ -0,0 +1,44 @@ +diff -Nru a/src/import/k9avidecode.cpp b/src/import/k9avidecode.cpp +--- a/src/import/k9avidecode.cpp 2014-09-29 17:00:12.000000000 +0200 ++++ b/src/import/k9avidecode.cpp 2017-03-10 06:42:21.692670007 +0100 +@@ -26,7 +26,6 @@ + void av_free_packet_internal(AVPacket *pkt) + { + if (pkt) { +- if (pkt->destruct) pkt->destruct(pkt); + pkt->data = NULL; pkt->size = 0; + } + } +@@ -238,14 +237,14 @@ + + int numBytes; + // Determine required buffer size and allocate buffer +- numBytes=avpicture_get_size(PIX_FMT_RGB24, m_CodecCtx->width, ++ numBytes=avpicture_get_size(AV_PIX_FMT_RGB24, m_CodecCtx->width, + m_CodecCtx->height); + m_buffer=(uint8_t *)av_malloc(numBytes*sizeof(uint8_t)); + + // Assign appropriate parts of buffer to image planes in pFrameRGB + // Note that pFrameRGB is an AVFrame, but AVFrame is a superset + // of AVPicture +- avpicture_fill((AVPicture *)m_FrameRGB, m_buffer, PIX_FMT_RGB24, ++ avpicture_fill((AVPicture *)m_FrameRGB, m_buffer, AV_PIX_FMT_RGB24, + m_CodecCtx->width, m_CodecCtx->height); + + +@@ -317,13 +316,13 @@ + bFound=true; + #ifndef HAVE_SWSCALE + // Convert the image from its native format to RGB +- img_convert((AVPicture *)m_FrameRGB, PIX_FMT_RGB24, ++ img_convert((AVPicture *)m_FrameRGB, AV_PIX_FMT_RGB24, + (AVPicture*)m_Frame, m_CodecCtx->pix_fmt, + m_CodecCtx->width, m_CodecCtx->height); + SaveFrame(m_FrameRGB, m_CodecCtx->width, + m_CodecCtx->height); + #else +- toRGB_convert_ctx=sws_getContext(m_CodecCtx->width, m_CodecCtx->height, m_CodecCtx->pix_fmt, m_CodecCtx->width, m_CodecCtx->height, PIX_FMT_RGB24, sws_flags,NULL,NULL,NULL); ++ toRGB_convert_ctx=sws_getContext(m_CodecCtx->width, m_CodecCtx->height, m_CodecCtx->pix_fmt, m_CodecCtx->width, m_CodecCtx->height, AV_PIX_FMT_RGB24, sws_flags,NULL,NULL,NULL); + sws_scale(toRGB_convert_ctx, m_Frame->data, m_Frame->linesize, 0, m_CodecCtx->height, m_FrameRGB->data,m_FrameRGB->linesize); + // convert frame to QImage + SaveFrame(m_FrameRGB, m_CodecCtx->width, diff --git a/multimedia/k9copy-reloaded/patches/k9copy-fix-desktop-files.patch b/multimedia/k9copy-reloaded/patches/k9copy-fix-desktop-files.patch new file mode 100644 index 0000000000..ace6842e87 --- /dev/null +++ b/multimedia/k9copy-reloaded/patches/k9copy-fix-desktop-files.patch @@ -0,0 +1,66 @@ +diff -Naur a/k9copy.desktop b/k9copy.desktop +--- a/k9copy.desktop 2014-09-29 11:00:11.000000000 -0400 ++++ b/k9copy.desktop 2020-12-25 20:56:36.228414115 -0500 +@@ -1,7 +1,7 @@ + [Desktop Entry] + Type=Application + Name=k9copy +-Exec=k9copy -caption "%c" %i %u ++Exec=k9copy "%c" %i %u + Comment=DVD9 to DVD5 backup tool + Comment[fr]=Backup de DVD9 en DVD5 + Comment[tr]=DVD9 DVD5 yedekleme aracı +@@ -15,5 +15,5 @@ + Terminal=false + Icon=k9copy + X-DocPath=k9copy/index.html +-Categories=Qt;KDE;AudioVideo;DiscBurning;AudioVideoEditing; ++Categories=Qt;KDE;AudioVideo;DiscBurning;AudioVideoEditing;Video; + X-KDE-StartupNotify=true +diff -Naur a/k9copy_assistant.desktop b/k9copy_assistant.desktop +--- a/k9copy_assistant.desktop 2014-09-29 11:00:12.000000000 -0400 ++++ b/k9copy_assistant.desktop 2020-12-25 20:56:36.228414115 -0500 +@@ -1,9 +1,7 @@ +-#!/usr/bin/env xdg-open + [Desktop Entry] +-Encoding=UTF-8 + Type=Application + Name=k9copy assistant +-Exec=k9copy --assistant -caption "%c" %i %m %u ++Exec=k9copy --assistant "%c" %i %m %u + Comment=DVD9 to DVD5 backup tool + Comment[fr]=Backup de DVD9 en DVD5 + Comment[tr]=DVD9 DVD5 yedekleme aracı +@@ -14,9 +12,8 @@ + GenericName[tr]=DVD Vidyo Yedekleme Aracı + GenericName[ru]=Копирование с видео-DVD + GenericName[uk]=Копіювання відео-DVD +-MimeTypes= + Terminal=false + Icon=k9copy + X-DocPath=k9copy/index.html +-Categories=Qt;KDE;AudioVideo;DiscBurning; +-X-KDE-StartupNotify=true +\ No newline at end of file ++Categories=Qt;KDE;AudioVideo;DiscBurning;Video; ++X-KDE-StartupNotify=true +diff -Naur a/k9copy_assistant_open.desktop b/k9copy_assistant_open.desktop +--- a/k9copy_assistant_open.desktop 2014-09-29 11:00:12.000000000 -0400 ++++ b/k9copy_assistant_open.desktop 2020-12-25 20:57:16.993844890 -0500 +@@ -11,4 +11,4 @@ + [Desktop Entry] + X-KDE-Solid-Predicate=[[ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'Data|VideoDvd' ] OR [ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'Data|VideoDvd' ]] + Type=Service +-Actions=open; +\ No newline at end of file ++Actions=open; +diff -Naur a/k9copy_open.desktop b/k9copy_open.desktop +--- a/k9copy_open.desktop 2014-09-29 11:00:12.000000000 -0400 ++++ b/k9copy_open.desktop 2020-12-25 20:57:45.522142523 -0500 +@@ -11,4 +11,4 @@ + [Desktop Entry] + X-KDE-Solid-Predicate=[[ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'Data|VideoDvd' ] OR [ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'Data|VideoDvd' ]] + Type=Service +-Actions=open; +\ No newline at end of file ++Actions=open; diff --git a/multimedia/k9copy-reloaded/patches/k9copy-gcc7.patch b/multimedia/k9copy-reloaded/patches/k9copy-gcc7.patch new file mode 100644 index 0000000000..a90cd7b368 --- /dev/null +++ b/multimedia/k9copy-reloaded/patches/k9copy-gcc7.patch @@ -0,0 +1,30 @@ +diff -up k9copy/src/backup/k9dvdbackup.cpp.gcc7 k9copy/src/backup/k9dvdbackup.cpp +--- k9copy/src/backup/k9dvdbackup.cpp.gcc7 2014-09-29 18:55:40.000000000 +0200 ++++ k9copy/src/backup/k9dvdbackup.cpp 2017-10-04 14:48:33.100692360 +0200 +@@ -907,7 +907,7 @@ k9Vobu * k9DVDBackup::remapOffset(uint32 + + + if ((vobu1 !=NULL) && (vobu2!=NULL)) { +- *_offset = abs(vobu1->newSector - vobu2->newSector) | maskOffset1 ; ++ *_offset = abs((int32_t)(vobu1->newSector - vobu2->newSector)) | maskOffset1 ; + *_offset |= maskOffset2; + return vobu2; + } +diff -up k9copy/src/backup/k9execcopy.cpp.gcc7 k9copy/src/backup/k9execcopy.cpp +--- k9copy/src/backup/k9execcopy.cpp.gcc7 2014-09-29 17:00:12.000000000 +0200 ++++ k9copy/src/backup/k9execcopy.cpp 2017-10-04 14:51:04.899589523 +0200 +@@ -306,12 +306,12 @@ void k9ExecCopy::createMkv(k9DVDTitle *_ + + #if QT_VERSION >= 0x050000 + m_progressDialog=new QProgressDialog(k9Dialogs::getMainWidget() ); +- m_progressDialog->setCancelButton(false); ++ m_progressDialog->setCancelButton(NULL); + + #else + m_progressDialog=new KProgressDialog(k9Dialogs::getMainWidget() ); + +- m_progressDialog->showCancelButton(false); ++ m_progressDialog->showCancelButton(NULL); + #endif + #if QT_VERSION >= 0x050000 + m_progressDialog->setMaximum(100); diff --git a/multimedia/k9copy-reloaded/patches/k9copy-installdirs.patch b/multimedia/k9copy-reloaded/patches/k9copy-installdirs.patch new file mode 100644 index 0000000000..ec923d1706 --- /dev/null +++ b/multimedia/k9copy-reloaded/patches/k9copy-installdirs.patch @@ -0,0 +1,29 @@ +diff -Naur k9copy.orig/CMakeLists.txt k9copy/CMakeLists.txt +--- k9copy.orig/CMakeLists.txt 2014-10-16 07:58:20.000000000 -0400 ++++ k9copy/CMakeLists.txt 2020-12-24 10:48:11.088907284 -0500 +@@ -1,3 +1,4 @@ ++cmake_minimum_required(VERSION 3.1) + project(k9copy) + set (VERSION 3.0.3) + +@@ -38,7 +38,7 @@ find_package(Qt5DBus REQUIRED) + find_package(Qt5Gui REQUIRED) + find_package(Qt5Widgets REQUIRED) + +-find_package(KF5 COMPONENTS REQUIRED I18n Config Su CoreAddons WidgetsAddons DocTools XmlGui Solid KIO IconThemes) ++find_package(KF5 COMPONENTS REQUIRED Auth I18n Config Su CoreAddons WidgetsAddons DocTools XmlGui Solid KIO IconThemes) + + else() + SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") +@@ -568,7 +569,11 @@ + + install( FILES k9copy.desktop k9copy_assistant.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) + #install( FILES k9copy.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) ++if(QT5_BUILD) ++install( FILES k9copyui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/k9copy ) ++else() + install( FILES k9copyui.rc DESTINATION ${DATA_INSTALL_DIR}/k9copy ) ++endif() + + install(FILES k9copy_open.desktop DESTINATION ${DATA_INSTALL_DIR}/solid/actions) + install(FILES k9copy_assistant_open.desktop DESTINATION ${DATA_INSTALL_DIR}/solid/actions) diff --git a/multimedia/k9copy-reloaded/patches/k9copy-mimetype.patch b/multimedia/k9copy-reloaded/patches/k9copy-mimetype.patch deleted file mode 100644 index 1c156d6055..0000000000 --- a/multimedia/k9copy-reloaded/patches/k9copy-mimetype.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- k9copy.orig/k9copy_assistant.desktop 2014-09-29 16:00:12.000000000 +0100 -+++ k9copy/k9copy_assistant.desktop 2015-05-28 20:08:49.318602109 +0100 -@@ -14,9 +14,8 @@ GenericName[fr]=Backup de DVD Video - GenericName[tr]=DVD Vidyo Yedekleme Aracı - GenericName[ru]=Копирование с видео-DVD - GenericName[uk]=Копіювання відео-DVD --MimeTypes= - Terminal=false - Icon=k9copy - X-DocPath=k9copy/index.html - Categories=Qt;KDE;AudioVideo;DiscBurning; --X-KDE-StartupNotify=true -\ No newline at end of file -+X-KDE-StartupNotify=true ---- k9copy.orig/k9copy_assistant_open.desktop 2014-09-29 16:00:12.000000000 +0100 -+++ k9copy/k9copy_assistant_open.desktop 2015-05-28 20:06:11.140619453 +0100 -@@ -11,4 +11,4 @@ NAme[uk]=Копіювати за доп - [Desktop Entry] - X-KDE-Solid-Predicate=[[ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'Data|VideoDvd' ] OR [ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'Data|VideoDvd' ]] - Type=Service --Actions=open; -\ No newline at end of file -+Actions=open; diff --git a/multimedia/k9copy-reloaded/patches/k9copy-missing-language-in-po-files.patch b/multimedia/k9copy-reloaded/patches/k9copy-missing-language-in-po-files.patch new file mode 100644 index 0000000000..6db2f51708 --- /dev/null +++ b/multimedia/k9copy-reloaded/patches/k9copy-missing-language-in-po-files.patch @@ -0,0 +1,221 @@ +diff -Naur k9copy.orig/po/ca.po k9copy/po/ca.po +--- k9copy.orig/po/ca.po 2014-09-29 11:00:12.000000000 -0400 ++++ k9copy/po/ca.po 2020-12-24 10:48:11.122907577 -0500 +@@ -12,6 +12,7 @@ + "PO-Revision-Date: 2006-09-06 19:13+0200\n" + "Last-Translator: Daniel Balagué Guardia <bullet@k-demar.org>\n" + "Language-Team: Català <ca@li.org>\n" ++"Language: ca\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +diff -Naur k9copy.orig/po/cs.po k9copy/po/cs.po +--- k9copy.orig/po/cs.po 2014-09-29 11:00:12.000000000 -0400 ++++ k9copy/po/cs.po 2020-12-24 10:48:11.123907586 -0500 +@@ -13,6 +13,7 @@ + "PO-Revision-Date: 2004-01-01 00:36+0100\n" + "Last-Translator: \n" + "Language-Team: Czech <kde-i18n-doc@kde.org>\n" ++"Language: cs\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +diff -Naur k9copy.orig/po/da.po k9copy/po/da.po +--- k9copy.orig/po/da.po 2014-09-29 11:00:12.000000000 -0400 ++++ k9copy/po/da.po 2020-12-24 10:48:11.125907603 -0500 +@@ -11,6 +11,7 @@ + "PO-Revision-Date: 2010-05-12 14:26+0200\n" + "Last-Translator: Martin Schlander <mschlander@opensuse.org>\n" + "Language-Team: Danish <opensuse-translation@opensuse.org>\n" ++"Language: da\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +diff -Naur k9copy.orig/po/de.po k9copy/po/de.po +--- k9copy.orig/po/de.po 2014-09-29 11:00:12.000000000 -0400 ++++ k9copy/po/de.po 2020-12-24 10:48:11.126907611 -0500 +@@ -11,6 +11,7 @@ + "PO-Revision-Date: 2009-06-12 14:13+0200\n" + "Last-Translator: Jan Berndt <Jan.Berndt@gmx.de>\n" + "Language-Team: deutsch <de@li.org>\n" ++"Language: de\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +diff -Naur k9copy.orig/po/el.po k9copy/po/el.po +--- k9copy.orig/po/el.po 2014-09-29 11:00:12.000000000 -0400 ++++ k9copy/po/el.po 2020-12-24 10:48:11.127907620 -0500 +@@ -13,6 +13,7 @@ + "PO-Revision-Date: 2007-10-17 11:33+0300\n" + "Last-Translator: Spiros Georgaras <sng@hellug.gr>\n" + "Language-Team: Greek <i18ngr@lists.hellug.gr>\n" ++"Language: el\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +diff -Naur k9copy.orig/po/es.po k9copy/po/es.po +--- k9copy.orig/po/es.po 2014-09-29 11:00:12.000000000 -0400 ++++ k9copy/po/es.po 2020-12-24 10:48:11.127907620 -0500 +@@ -12,6 +12,7 @@ + "PO-Revision-Date: 2006-09-06 19:11+0200\n" + "Last-Translator: Daniel Balagué Guardia <bullet@k-demar.org>\n" + "Language-Team: Català <ca@li.org>\n" ++"Language: es\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +diff -Naur k9copy.orig/po/es_AR.po k9copy/po/es_AR.po +--- k9copy.orig/po/es_AR.po 2014-09-29 11:00:12.000000000 -0400 ++++ k9copy/po/es_AR.po 2020-12-24 10:48:11.128907629 -0500 +@@ -10,6 +10,7 @@ + "PO-Revision-Date: 2008-04-30 03:57-0300\n" + "Last-Translator: Fernando Toledo <ftoledo@docksud.com.ar>\n" + "Language-Team: Español (Argentina) <es@li.org>\n" ++"Language: es_AR\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +diff -Naur k9copy.orig/po/fr.po k9copy/po/fr.po +--- k9copy.orig/po/fr.po 2014-09-29 11:00:12.000000000 -0400 ++++ k9copy/po/fr.po 2020-12-24 10:48:11.128907629 -0500 +@@ -9,6 +9,7 @@ + "PO-Revision-Date: 2007-07-24 09:24+0200\n" + "Last-Translator: Jean-Michel Petit <k9copy@free.fr>\n" + "Language-Team: <fr@li.org>\n" ++"Language: fr\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +diff -Naur k9copy.orig/po/it.po k9copy/po/it.po +--- k9copy.orig/po/it.po 2014-09-29 11:00:12.000000000 -0400 ++++ k9copy/po/it.po 2020-12-24 10:48:11.129907637 -0500 +@@ -15,6 +15,7 @@ + "PO-Revision-Date: 2008-03-25 18:47+0100\n" + "Last-Translator: Leonardo Finetti <finex@finex.org>\n" + "Language-Team: italian <kde-i18n-it@kde.org>\n" ++"Language: it\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +diff -Naur k9copy.orig/po/ja.po k9copy/po/ja.po +--- k9copy.orig/po/ja.po 2014-09-29 11:00:12.000000000 -0400 ++++ k9copy/po/ja.po 2020-12-24 10:48:11.129907637 -0500 +@@ -12,6 +12,7 @@ + "PO-Revision-Date: 2010-07-11 10:17+0900\n" + "Last-Translator: Munehiro Yamamoto <munepixyz@gmail.com>\n" + "Language-Team: munepi <munepixyz@gmail.com>\n" ++"Language: ja\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: \n" +diff -Naur k9copy.orig/po/k9copy.pot k9copy/po/k9copy.pot +--- k9copy.orig/po/k9copy.pot 2014-09-29 11:00:12.000000000 -0400 ++++ k9copy/po/k9copy.pot 2020-12-24 10:48:11.130907646 -0500 +@@ -13,6 +13,7 @@ + "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" + "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" + "Language-Team: LANGUAGE <LL@li.org>\n" ++"Language: en\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=CHARSET\n" + "Content-Transfer-Encoding: 8bit\n" +diff -Naur k9copy.orig/po/nl.po k9copy/po/nl.po +--- k9copy.orig/po/nl.po 2014-09-29 11:00:12.000000000 -0400 ++++ k9copy/po/nl.po 2020-12-24 10:48:11.130907646 -0500 +@@ -11,6 +11,7 @@ + "PO-Revision-Date: 2009-05-10 16:15+0200\n" + "Last-Translator: \n" + "Language-Team: Dutch <kde-i18n-doc@kde.org>\n" ++"Language: nl\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +diff -Naur k9copy.orig/po/pl.po k9copy/po/pl.po +--- k9copy.orig/po/pl.po 2014-09-29 11:00:12.000000000 -0400 ++++ k9copy/po/pl.po 2020-12-24 10:48:11.130907646 -0500 +@@ -13,6 +13,7 @@ + "PO-Revision-Date: 2006-09-27 11:51+0200\n" + "Last-Translator: Wojciech Nawrocki <wojtasin@o2.pl>\n" + "Language-Team: Polski <pl@li.org>\n" ++"Language: pl\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +diff -Naur k9copy.orig/po/pt_BR.po k9copy/po/pt_BR.po +--- k9copy.orig/po/pt_BR.po 2014-09-29 11:00:12.000000000 -0400 ++++ k9copy/po/pt_BR.po 2020-12-24 10:48:11.131907655 -0500 +@@ -14,6 +14,7 @@ + "PO-Revision-Date: 2010-02-08 21:04-0200\n" + "Last-Translator: Phantom X <megaphantomx at bol.com.br>\n" + "Language-Team: Português do Brasil <pt@li.org>\n" ++"Language: pt_BR\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +diff -Naur k9copy.orig/po/ru.po k9copy/po/ru.po +--- k9copy.orig/po/ru.po 2014-09-29 11:00:12.000000000 -0400 ++++ k9copy/po/ru.po 2020-12-24 10:48:11.133907672 -0500 +@@ -11,6 +11,7 @@ + "PO-Revision-Date: 2010-01-01 17:32+0000\n" + "Last-Translator: kostya_hm <kostya.hm@rambler.ru>\n" + "Language-Team: Russian <none>\n" ++"Language: ru\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +diff -Naur k9copy.orig/po/sr.po k9copy/po/sr.po +--- k9copy.orig/po/sr.po 2014-09-29 11:00:12.000000000 -0400 ++++ k9copy/po/sr.po 2020-12-24 10:48:11.133907672 -0500 +@@ -14,6 +14,7 @@ + "PO-Revision-Date: 2007-08-15 11:15+0100\n" + "Last-Translator: Милош Поповић <gpopac@gmail.com>\n" + "Language-Team: Serbian <gnom@prevod.org>\n" ++"Language: sr\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +diff -Naur k9copy.orig/po/sr@Latn.po k9copy/po/sr@Latn.po +--- k9copy.orig/po/sr@Latn.po 2014-09-29 11:00:12.000000000 -0400 ++++ k9copy/po/sr@Latn.po 2020-12-24 10:48:11.135907689 -0500 +@@ -14,6 +14,7 @@ + "PO-Revision-Date: 2007-08-15 11:15+0100\n" + "Last-Translator: Miloš Popović <gpopac@gmail.com>\n" + "Language-Team: Serbian <gnom@prevod.org>\n" ++"Language: sr@Latn\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +diff -Naur k9copy.orig/po/tr.po k9copy/po/tr.po +--- k9copy.orig/po/tr.po 2014-09-29 11:00:12.000000000 -0400 ++++ k9copy/po/tr.po 2020-12-24 10:48:11.136907698 -0500 +@@ -14,6 +14,7 @@ + "PO-Revision-Date: 2007-10-17 11:01+0300\n" + "Last-Translator: Murat Şenel <muratasenel@gmail.com>\n" + "Language-Team: <tr@li.org>\n" ++"Language: tr\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +diff -Naur k9copy.orig/po/uk.po k9copy/po/uk.po +--- k9copy.orig/po/uk.po 2014-09-29 11:00:12.000000000 -0400 ++++ k9copy/po/uk.po 2020-12-24 10:48:11.137907707 -0500 +@@ -11,7 +11,7 @@ + "PO-Revision-Date: 2011-07-24 12:18+0300\n" + "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" + "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n" +-"Language: \n" ++"Language: uk\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +diff -Naur k9copy.orig/po/zh_TW.po k9copy/po/zh_TW.po +--- k9copy.orig/po/zh_TW.po 2014-09-29 11:00:12.000000000 -0400 ++++ k9copy/po/zh_TW.po 2020-12-24 10:48:11.137907707 -0500 +@@ -12,6 +12,7 @@ + "PO-Revision-Date: 2007-10-24 19:43+0800\n" + "Last-Translator: 洪任諭 <pcman.tw@gmail.com>\n" + "Language-Team: Traditional Chinese <LL@li.org>\n" ++"Language: zh_TW\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=utf-8\n" + "Content-Transfer-Encoding: 8bit\n" diff --git a/multimedia/k9copy-reloaded/patches/k9copy-reloaded-consolidated-fixes.patch b/multimedia/k9copy-reloaded/patches/k9copy-reloaded-consolidated-fixes.patch deleted file mode 100644 index 0f1e0e16fe..0000000000 --- a/multimedia/k9copy-reloaded/patches/k9copy-reloaded-consolidated-fixes.patch +++ /dev/null @@ -1,581 +0,0 @@ -diff -Naur k9copy.orig/CMakeLists.txt k9copy/CMakeLists.txt ---- k9copy.orig/CMakeLists.txt 2014-10-16 07:58:20.000000000 -0400 -+++ k9copy/CMakeLists.txt 2020-12-24 10:48:11.088907284 -0500 -@@ -1,3 +1,4 @@ -+cmake_minimum_required(VERSION 3.1) - project(k9copy) - set (VERSION 3.0.3) - -@@ -568,7 +569,11 @@ - - install( FILES k9copy.desktop k9copy_assistant.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) - #install( FILES k9copy.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) -+if(QT5_BUILD) -+install( FILES k9copyui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/k9copy ) -+else() - install( FILES k9copyui.rc DESTINATION ${DATA_INSTALL_DIR}/k9copy ) -+endif() - - install(FILES k9copy_open.desktop DESTINATION ${DATA_INSTALL_DIR}/solid/actions) - install(FILES k9copy_assistant_open.desktop DESTINATION ${DATA_INSTALL_DIR}/solid/actions) -diff -Naur k9copy.orig/k9copy.desktop k9copy/k9copy.desktop ---- k9copy.orig/k9copy.desktop 2014-09-29 11:00:11.000000000 -0400 -+++ k9copy/k9copy.desktop 2020-12-24 10:48:11.089907292 -0500 -@@ -1,13 +1,15 @@ - [Desktop Entry] - Type=Application --Name=k9copy --Exec=k9copy -caption "%c" %i %u -+Name=K9copy -+Exec=k9copy - Comment=DVD9 to DVD5 backup tool -+Comment[de]=DVD9 auf DVD5 sichern - Comment[fr]=Backup de DVD9 en DVD5 - Comment[tr]=DVD9 DVD5 yedekleme aracı - Comment[ru]=Инструмент для копирования с DVD9 на DVD5 - Comment[uk]=Інструмент резервного копіювання DVD - GenericName=Video DVD Backup -+GenericName[de]=Video-DVD-Sicherung - GenericName[fr]=Backup de DVD Video - GenericName[tr]=DVD Vidyo Yedekleme Aracı - GenericName[ru]=Копирование с видео-DVD -diff -Naur k9copy.orig/k9copy_assistant.desktop k9copy/k9copy_assistant.desktop ---- k9copy.orig/k9copy_assistant.desktop 2014-09-29 11:00:12.000000000 -0400 -+++ k9copy/k9copy_assistant.desktop 2020-12-24 10:48:11.089907292 -0500 -@@ -1,9 +1,7 @@ --#!/usr/bin/env xdg-open - [Desktop Entry] --Encoding=UTF-8 - Type=Application --Name=k9copy assistant --Exec=k9copy --assistant -caption "%c" %i %m %u -+Name=K9copy assistant -+Exec=k9copy --assistant - Comment=DVD9 to DVD5 backup tool - Comment[fr]=Backup de DVD9 en DVD5 - Comment[tr]=DVD9 DVD5 yedekleme aracı -@@ -14,9 +12,8 @@ - GenericName[tr]=DVD Vidyo Yedekleme Aracı - GenericName[ru]=Копирование с видео-DVD - GenericName[uk]=Копіювання відео-DVD --MimeTypes= - Terminal=false - Icon=k9copy - X-DocPath=k9copy/index.html - Categories=Qt;KDE;AudioVideo;DiscBurning; --X-KDE-StartupNotify=true -\ No newline at end of file -+X-KDE-StartupNotify=true -diff -Naur k9copy.orig/k9copy_assistant_open.desktop k9copy/k9copy_assistant_open.desktop ---- k9copy.orig/k9copy_assistant_open.desktop 2014-09-29 11:00:12.000000000 -0400 -+++ k9copy/k9copy_assistant_open.desktop 2020-12-24 10:48:11.121907568 -0500 -@@ -1,5 +1,5 @@ - [Desktop Action open] --Exec=k9copy --input %f --assistant -+Exec=k9copy --assistant - Icon=k9copy - Name=Copy with k9copy (wizard) - Name[fr]=Copier avec k9copy (wizard) -@@ -11,4 +11,4 @@ - [Desktop Entry] - X-KDE-Solid-Predicate=[[ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'Data|VideoDvd' ] OR [ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'Data|VideoDvd' ]] - Type=Service --Actions=open; -\ No newline at end of file -+Actions=open; -diff -Naur k9copy.orig/po/ca.po k9copy/po/ca.po ---- k9copy.orig/po/ca.po 2014-09-29 11:00:12.000000000 -0400 -+++ k9copy/po/ca.po 2020-12-24 10:48:11.122907577 -0500 -@@ -12,6 +12,7 @@ - "PO-Revision-Date: 2006-09-06 19:13+0200\n" - "Last-Translator: Daniel Balagué Guardia <bullet@k-demar.org>\n" - "Language-Team: Català <ca@li.org>\n" -+"Language: ca\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -diff -Naur k9copy.orig/po/cs.po k9copy/po/cs.po ---- k9copy.orig/po/cs.po 2014-09-29 11:00:12.000000000 -0400 -+++ k9copy/po/cs.po 2020-12-24 10:48:11.123907586 -0500 -@@ -13,6 +13,7 @@ - "PO-Revision-Date: 2004-01-01 00:36+0100\n" - "Last-Translator: \n" - "Language-Team: Czech <kde-i18n-doc@kde.org>\n" -+"Language: cs\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -diff -Naur k9copy.orig/po/da.po k9copy/po/da.po ---- k9copy.orig/po/da.po 2014-09-29 11:00:12.000000000 -0400 -+++ k9copy/po/da.po 2020-12-24 10:48:11.125907603 -0500 -@@ -11,6 +11,7 @@ - "PO-Revision-Date: 2010-05-12 14:26+0200\n" - "Last-Translator: Martin Schlander <mschlander@opensuse.org>\n" - "Language-Team: Danish <opensuse-translation@opensuse.org>\n" -+"Language: da\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -diff -Naur k9copy.orig/po/de.po k9copy/po/de.po ---- k9copy.orig/po/de.po 2014-09-29 11:00:12.000000000 -0400 -+++ k9copy/po/de.po 2020-12-24 10:48:11.126907611 -0500 -@@ -11,6 +11,7 @@ - "PO-Revision-Date: 2009-06-12 14:13+0200\n" - "Last-Translator: Jan Berndt <Jan.Berndt@gmx.de>\n" - "Language-Team: deutsch <de@li.org>\n" -+"Language: de\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -diff -Naur k9copy.orig/po/el.po k9copy/po/el.po ---- k9copy.orig/po/el.po 2014-09-29 11:00:12.000000000 -0400 -+++ k9copy/po/el.po 2020-12-24 10:48:11.127907620 -0500 -@@ -13,6 +13,7 @@ - "PO-Revision-Date: 2007-10-17 11:33+0300\n" - "Last-Translator: Spiros Georgaras <sng@hellug.gr>\n" - "Language-Team: Greek <i18ngr@lists.hellug.gr>\n" -+"Language: el\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -diff -Naur k9copy.orig/po/es.po k9copy/po/es.po ---- k9copy.orig/po/es.po 2014-09-29 11:00:12.000000000 -0400 -+++ k9copy/po/es.po 2020-12-24 10:48:11.127907620 -0500 -@@ -12,6 +12,7 @@ - "PO-Revision-Date: 2006-09-06 19:11+0200\n" - "Last-Translator: Daniel Balagué Guardia <bullet@k-demar.org>\n" - "Language-Team: Català <ca@li.org>\n" -+"Language: es\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -diff -Naur k9copy.orig/po/es_AR.po k9copy/po/es_AR.po ---- k9copy.orig/po/es_AR.po 2014-09-29 11:00:12.000000000 -0400 -+++ k9copy/po/es_AR.po 2020-12-24 10:48:11.128907629 -0500 -@@ -10,6 +10,7 @@ - "PO-Revision-Date: 2008-04-30 03:57-0300\n" - "Last-Translator: Fernando Toledo <ftoledo@docksud.com.ar>\n" - "Language-Team: Español (Argentina) <es@li.org>\n" -+"Language: es_AR\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -diff -Naur k9copy.orig/po/fr.po k9copy/po/fr.po ---- k9copy.orig/po/fr.po 2014-09-29 11:00:12.000000000 -0400 -+++ k9copy/po/fr.po 2020-12-24 10:48:11.128907629 -0500 -@@ -9,6 +9,7 @@ - "PO-Revision-Date: 2007-07-24 09:24+0200\n" - "Last-Translator: Jean-Michel Petit <k9copy@free.fr>\n" - "Language-Team: <fr@li.org>\n" -+"Language: fr\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -diff -Naur k9copy.orig/po/it.po k9copy/po/it.po ---- k9copy.orig/po/it.po 2014-09-29 11:00:12.000000000 -0400 -+++ k9copy/po/it.po 2020-12-24 10:48:11.129907637 -0500 -@@ -15,6 +15,7 @@ - "PO-Revision-Date: 2008-03-25 18:47+0100\n" - "Last-Translator: Leonardo Finetti <finex@finex.org>\n" - "Language-Team: italian <kde-i18n-it@kde.org>\n" -+"Language: it\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -diff -Naur k9copy.orig/po/ja.po k9copy/po/ja.po ---- k9copy.orig/po/ja.po 2014-09-29 11:00:12.000000000 -0400 -+++ k9copy/po/ja.po 2020-12-24 10:48:11.129907637 -0500 -@@ -12,6 +12,7 @@ - "PO-Revision-Date: 2010-07-11 10:17+0900\n" - "Last-Translator: Munehiro Yamamoto <munepixyz@gmail.com>\n" - "Language-Team: munepi <munepixyz@gmail.com>\n" -+"Language: ja\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: \n" -diff -Naur k9copy.orig/po/k9copy.pot k9copy/po/k9copy.pot ---- k9copy.orig/po/k9copy.pot 2014-09-29 11:00:12.000000000 -0400 -+++ k9copy/po/k9copy.pot 2020-12-24 10:48:11.130907646 -0500 -@@ -13,6 +13,7 @@ - "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" - "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" - "Language-Team: LANGUAGE <LL@li.org>\n" -+"Language: en\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=CHARSET\n" - "Content-Transfer-Encoding: 8bit\n" -diff -Naur k9copy.orig/po/nl.po k9copy/po/nl.po ---- k9copy.orig/po/nl.po 2014-09-29 11:00:12.000000000 -0400 -+++ k9copy/po/nl.po 2020-12-24 10:48:11.130907646 -0500 -@@ -11,6 +11,7 @@ - "PO-Revision-Date: 2009-05-10 16:15+0200\n" - "Last-Translator: \n" - "Language-Team: Dutch <kde-i18n-doc@kde.org>\n" -+"Language: nl\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -diff -Naur k9copy.orig/po/pl.po k9copy/po/pl.po ---- k9copy.orig/po/pl.po 2014-09-29 11:00:12.000000000 -0400 -+++ k9copy/po/pl.po 2020-12-24 10:48:11.130907646 -0500 -@@ -13,6 +13,7 @@ - "PO-Revision-Date: 2006-09-27 11:51+0200\n" - "Last-Translator: Wojciech Nawrocki <wojtasin@o2.pl>\n" - "Language-Team: Polski <pl@li.org>\n" -+"Language: pl\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -diff -Naur k9copy.orig/po/pt_BR.po k9copy/po/pt_BR.po ---- k9copy.orig/po/pt_BR.po 2014-09-29 11:00:12.000000000 -0400 -+++ k9copy/po/pt_BR.po 2020-12-24 10:48:11.131907655 -0500 -@@ -14,6 +14,7 @@ - "PO-Revision-Date: 2010-02-08 21:04-0200\n" - "Last-Translator: Phantom X <megaphantomx at bol.com.br>\n" - "Language-Team: Português do Brasil <pt@li.org>\n" -+"Language: pt_BR\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -diff -Naur k9copy.orig/po/ru.po k9copy/po/ru.po ---- k9copy.orig/po/ru.po 2014-09-29 11:00:12.000000000 -0400 -+++ k9copy/po/ru.po 2020-12-24 10:48:11.133907672 -0500 -@@ -11,6 +11,7 @@ - "PO-Revision-Date: 2010-01-01 17:32+0000\n" - "Last-Translator: kostya_hm <kostya.hm@rambler.ru>\n" - "Language-Team: Russian <none>\n" -+"Language: ru\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -diff -Naur k9copy.orig/po/sr.po k9copy/po/sr.po ---- k9copy.orig/po/sr.po 2014-09-29 11:00:12.000000000 -0400 -+++ k9copy/po/sr.po 2020-12-24 10:48:11.133907672 -0500 -@@ -14,6 +14,7 @@ - "PO-Revision-Date: 2007-08-15 11:15+0100\n" - "Last-Translator: Милош Поповић <gpopac@gmail.com>\n" - "Language-Team: Serbian <gnom@prevod.org>\n" -+"Language: sr\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -diff -Naur k9copy.orig/po/sr@Latn.po k9copy/po/sr@Latn.po ---- k9copy.orig/po/sr@Latn.po 2014-09-29 11:00:12.000000000 -0400 -+++ k9copy/po/sr@Latn.po 2020-12-24 10:48:11.135907689 -0500 -@@ -14,6 +14,7 @@ - "PO-Revision-Date: 2007-08-15 11:15+0100\n" - "Last-Translator: Miloš Popović <gpopac@gmail.com>\n" - "Language-Team: Serbian <gnom@prevod.org>\n" -+"Language: sr@Latn\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -diff -Naur k9copy.orig/po/tr.po k9copy/po/tr.po ---- k9copy.orig/po/tr.po 2014-09-29 11:00:12.000000000 -0400 -+++ k9copy/po/tr.po 2020-12-24 10:48:11.136907698 -0500 -@@ -14,6 +14,7 @@ - "PO-Revision-Date: 2007-10-17 11:01+0300\n" - "Last-Translator: Murat Şenel <muratasenel@gmail.com>\n" - "Language-Team: <tr@li.org>\n" -+"Language: tr\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -diff -Naur k9copy.orig/po/uk.po k9copy/po/uk.po ---- k9copy.orig/po/uk.po 2014-09-29 11:00:12.000000000 -0400 -+++ k9copy/po/uk.po 2020-12-24 10:48:11.137907707 -0500 -@@ -11,7 +11,7 @@ - "PO-Revision-Date: 2011-07-24 12:18+0300\n" - "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" - "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n" --"Language: \n" -+"Language: uk\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -diff -Naur k9copy.orig/po/zh_TW.po k9copy/po/zh_TW.po ---- k9copy.orig/po/zh_TW.po 2014-09-29 11:00:12.000000000 -0400 -+++ k9copy/po/zh_TW.po 2020-12-24 10:48:11.137907707 -0500 -@@ -12,6 +12,7 @@ - "PO-Revision-Date: 2007-10-24 19:43+0800\n" - "Last-Translator: 洪任諭 <pcman.tw@gmail.com>\n" - "Language-Team: Traditional Chinese <LL@li.org>\n" -+"Language: zh_TW\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=utf-8\n" - "Content-Transfer-Encoding: 8bit\n" -diff -Naur k9copy.orig/src/backup/k9dvdbackup.cpp k9copy/src/backup/k9dvdbackup.cpp ---- k9copy.orig/src/backup/k9dvdbackup.cpp 2014-09-29 12:55:40.000000000 -0400 -+++ k9copy/src/backup/k9dvdbackup.cpp 2020-12-24 14:26:13.473270218 -0500 -@@ -907,7 +907,7 @@ k9Vobu * k9DVDBackup::remapOffset(uint32 - - - if ((vobu1 !=NULL) && (vobu2!=NULL)) { -- *_offset = abs(vobu1->newSector - vobu2->newSector) | maskOffset1 ; -+ *_offset = abs((int32_t)(vobu1->newSector - vobu2->newSector)) | maskOffset1 ; - *_offset |= maskOffset2; - return vobu2; - } -diff -Naur k9copy.orig/src/backup/k9execcopy.cpp k9copy/src/backup/k9execcopy.cpp ---- k9copy.orig/src/backup/k9execcopy.cpp 2014-09-29 11:00:12.000000000 -0400 -+++ k9copy/src/backup/k9execcopy.cpp 2020-12-24 10:48:11.138907715 -0500 -@@ -306,7 +306,7 @@ - - #if QT_VERSION >= 0x050000 - m_progressDialog=new QProgressDialog(k9Dialogs::getMainWidget() ); -- m_progressDialog->setCancelButton(false); -+ m_progressDialog->setCancelButton(NULL); - - #else - m_progressDialog=new KProgressDialog(k9Dialogs::getMainWidget() ); -diff -Naur k9copy.orig/src/import/k9avidecode.cpp k9copy/src/import/k9avidecode.cpp ---- k9copy.orig/src/import/k9avidecode.cpp 2014-09-29 11:00:12.000000000 -0400 -+++ k9copy/src/import/k9avidecode.cpp 2020-12-24 12:11:16.447891983 -0500 -@@ -26,7 +26,6 @@ - void av_free_packet_internal(AVPacket *pkt) - { - if (pkt) { -- if (pkt->destruct) pkt->destruct(pkt); - pkt->data = NULL; pkt->size = 0; - } - } -@@ -238,14 +237,14 @@ - - int numBytes; - // Determine required buffer size and allocate buffer -- numBytes=avpicture_get_size(PIX_FMT_RGB24, m_CodecCtx->width, -+ numBytes=avpicture_get_size(AV_PIX_FMT_RGB24, m_CodecCtx->width, - m_CodecCtx->height); - m_buffer=(uint8_t *)av_malloc(numBytes*sizeof(uint8_t)); - - // Assign appropriate parts of buffer to image planes in pFrameRGB - // Note that pFrameRGB is an AVFrame, but AVFrame is a superset - // of AVPicture -- avpicture_fill((AVPicture *)m_FrameRGB, m_buffer, PIX_FMT_RGB24, -+ avpicture_fill((AVPicture *)m_FrameRGB, m_buffer, AV_PIX_FMT_RGB24, - m_CodecCtx->width, m_CodecCtx->height); - - -@@ -317,13 +316,13 @@ - bFound=true; - #ifndef HAVE_SWSCALE - // Convert the image from its native format to RGB -- img_convert((AVPicture *)m_FrameRGB, PIX_FMT_RGB24, -+ img_convert((AVPicture *)m_FrameRGB, AV_PIX_FMT_RGB24, - (AVPicture*)m_Frame, m_CodecCtx->pix_fmt, - m_CodecCtx->width, m_CodecCtx->height); - SaveFrame(m_FrameRGB, m_CodecCtx->width, - m_CodecCtx->height); - #else -- toRGB_convert_ctx=sws_getContext(m_CodecCtx->width, m_CodecCtx->height, m_CodecCtx->pix_fmt, m_CodecCtx->width, m_CodecCtx->height, PIX_FMT_RGB24, sws_flags,NULL,NULL,NULL); -+ toRGB_convert_ctx=sws_getContext(m_CodecCtx->width, m_CodecCtx->height, m_CodecCtx->pix_fmt, m_CodecCtx->width, m_CodecCtx->height, AV_PIX_FMT_RGB24, sws_flags,NULL,NULL,NULL); - sws_scale(toRGB_convert_ctx, m_Frame->data, m_Frame->linesize, 0, m_CodecCtx->height, m_FrameRGB->data,m_FrameRGB->linesize); - // convert frame to QImage - SaveFrame(m_FrameRGB, m_CodecCtx->width, -diff -Naur k9copy.orig/src/libdvdnav-NOW/dvdnav/dvdnav.h k9copy/src/libdvdnav-NOW/dvdnav/dvdnav.h ---- k9copy.orig/src/libdvdnav-NOW/dvdnav/dvdnav.h 2014-09-29 11:50:54.000000000 -0400 -+++ k9copy/src/libdvdnav-NOW/dvdnav/dvdnav.h 2020-12-24 10:48:11.139907724 -0500 -@@ -32,11 +32,11 @@ - extern "C" { - #endif - --#include <dvdnav/dvd_types.h> --#include <dvdread/dvd_reader.h> --#include <dvdread/nav_types.h> --#include <dvdread/ifo_types.h> /* For vm_cmd_t */ --#include <dvdnav/dvdnav_events.h> -+#include "dvdnav/dvd_types.h" -+#include "dvdread/dvd_reader.h" -+#include "dvdread/nav_types.h" -+#include "dvdread/ifo_types.h" /* For vm_cmd_t */ -+#include "dvdnav/dvdnav_events.h" - - - -diff -Naur k9copy.orig/src/libdvdnav-NOW/dvdnav.c k9copy/src/libdvdnav-NOW/dvdnav.c ---- k9copy.orig/src/libdvdnav-NOW/dvdnav.c 2014-09-29 12:02:49.000000000 -0400 -+++ k9copy/src/libdvdnav-NOW/dvdnav.c 2020-12-24 10:48:11.139907724 -0500 -@@ -34,14 +34,14 @@ - #include <string.h> - #include <sys/time.h> - #include "dvdnav/dvdnav.h" --#include <dvdread/dvd_reader.h> --#include <dvdread/nav_types.h> --#include <dvdread/ifo_types.h> /* For vm_cmd_t */ -+#include "dvdread/dvd_reader.h" -+#include "dvdread/nav_types.h" -+#include "dvdread/ifo_types.h" /* For vm_cmd_t */ - #include "vm/decoder.h" - #include "vm/vm.h" - #include "dvdnav_internal.h" - #include "read_cache.h" --#include <dvdread/nav_read.h> -+#include "dvdread/nav_read.h" - - static dvdnav_status_t dvdnav_clear(dvdnav_t * this) { - /* clear everything except file, vm, mutex, readahead */ -diff -Naur k9copy.orig/src/libdvdnav-NOW/highlight.c k9copy/src/libdvdnav-NOW/highlight.c ---- k9copy.orig/src/libdvdnav-NOW/highlight.c 2014-09-29 11:50:54.000000000 -0400 -+++ k9copy/src/libdvdnav-NOW/highlight.c 2020-12-24 10:48:11.139907724 -0500 -@@ -29,7 +29,7 @@ - #include <limits.h> - #include <string.h> - #include <sys/time.h> --#include <dvdread/nav_types.h> -+#include "dvdread/nav_types.h" - #include "dvdnav/dvdnav.h" - #include "vm/decoder.h" - #include "vm/vm.h" -diff -Naur k9copy.orig/src/libdvdnav-NOW/navigation.c k9copy/src/libdvdnav-NOW/navigation.c ---- k9copy.orig/src/libdvdnav-NOW/navigation.c 2014-09-29 11:50:54.000000000 -0400 -+++ k9copy/src/libdvdnav-NOW/navigation.c 2020-12-24 10:48:11.139907724 -0500 -@@ -27,8 +27,8 @@ - #include <string.h> - #include <sys/time.h> - #include "dvdnav/dvdnav.h" --#include <dvdread/nav_types.h> --#include <dvdread/ifo_types.h> -+#include "dvdread/nav_types.h" -+#include "dvdread/ifo_types.h" - #include "vm/decoder.h" - #include "vm/vm.h" - #include "dvdnav_internal.h" -diff -Naur k9copy.orig/src/libdvdnav-NOW/read_cache.c k9copy/src/libdvdnav-NOW/read_cache.c ---- k9copy.orig/src/libdvdnav-NOW/read_cache.c 2014-09-29 11:50:54.000000000 -0400 -+++ k9copy/src/libdvdnav-NOW/read_cache.c 2020-12-24 10:48:11.140907732 -0500 -@@ -34,8 +34,8 @@ - #include <sys/time.h> - #include <time.h> - #include "dvdnav/dvdnav.h" --#include <dvdread/nav_types.h> --#include <dvdread/ifo_types.h> -+#include "dvdread/nav_types.h" -+#include "dvdread/ifo_types.h" - #include "vm/decoder.h" - #include "vm/vm.h" - #include "dvdnav_internal.h" -diff -Naur k9copy.orig/src/libdvdnav-NOW/searching.c k9copy/src/libdvdnav-NOW/searching.c ---- k9copy.orig/src/libdvdnav-NOW/searching.c 2014-09-29 11:50:54.000000000 -0400 -+++ k9copy/src/libdvdnav-NOW/searching.c 2020-12-24 10:48:11.140907732 -0500 -@@ -30,12 +30,12 @@ - #include <stdlib.h> - #include <sys/time.h> - #include "dvdnav/dvdnav.h" --#include <dvdread/nav_types.h> --#include <dvdread/ifo_types.h> -+#include "dvdread/nav_types.h" -+#include "dvdread/ifo_types.h" - #include "vm/decoder.h" - #include "vm/vm.h" - #include "dvdnav_internal.h" --#include <dvdread/ifo_read.h> -+#include "dvdread/ifo_read.h" - - /* - #define LOG_DEBUG -diff -Naur k9copy.orig/src/libdvdnav-NOW/settings.c k9copy/src/libdvdnav-NOW/settings.c ---- k9copy.orig/src/libdvdnav-NOW/settings.c 2014-09-29 11:50:54.000000000 -0400 -+++ k9copy/src/libdvdnav-NOW/settings.c 2020-12-24 10:48:11.140907732 -0500 -@@ -27,8 +27,8 @@ - #include <string.h> - #include <sys/time.h> - #include "dvdnav/dvdnav.h" --#include <dvdread/nav_types.h> --#include <dvdread/ifo_types.h> -+#include "dvdread/nav_types.h" -+#include "dvdread/ifo_types.h" - #include "vm/decoder.h" - #include "vm/vm.h" - #include "dvdnav_internal.h" -diff -Naur k9copy.orig/src/libdvdnav-NOW/vm/decoder.c k9copy/src/libdvdnav-NOW/vm/decoder.c ---- k9copy.orig/src/libdvdnav-NOW/vm/decoder.c 2014-09-29 11:50:54.000000000 -0400 -+++ k9copy/src/libdvdnav-NOW/vm/decoder.c 2020-12-24 10:48:11.140907732 -0500 -@@ -32,8 +32,8 @@ - #include <sys/time.h> - #include <assert.h> - --#include <dvdread/nav_types.h> --#include <dvdread/ifo_types.h> /* vm_cmd_t */ -+#include "dvdread/nav_types.h" -+#include "dvdread/ifo_types.h" /* vm_cmd_t */ - - #include "dvdnav/dvdnav.h" - #include "decoder.h" -diff -Naur k9copy.orig/src/libdvdnav-NOW/vm/getset.c k9copy/src/libdvdnav-NOW/vm/getset.c ---- k9copy.orig/src/libdvdnav-NOW/vm/getset.c 2014-09-29 11:50:54.000000000 -0400 -+++ k9copy/src/libdvdnav-NOW/vm/getset.c 2020-12-24 10:48:11.141907741 -0500 -@@ -30,9 +30,9 @@ - #include <stdio.h> - #include <inttypes.h> - --#include <dvdread/nav_types.h> --#include <dvdread/ifo_types.h> --#include <dvdread/ifo_read.h> -+#include "dvdread/nav_types.h" -+#include "dvdread/ifo_types.h" -+#include "dvdread/ifo_read.h" - #include "dvdnav/dvdnav.h" - - #include "decoder.h" -diff -Naur k9copy.orig/src/libdvdnav-NOW/vm/play.c k9copy/src/libdvdnav-NOW/vm/play.c ---- k9copy.orig/src/libdvdnav-NOW/vm/play.c 2014-09-29 11:50:54.000000000 -0400 -+++ k9copy/src/libdvdnav-NOW/vm/play.c 2020-12-24 10:48:11.141907741 -0500 -@@ -29,9 +29,9 @@ - #include <stdlib.h> - #include <stdio.h> - --#include <dvdread/nav_types.h> --#include <dvdread/ifo_types.h> --#include <dvdread/ifo_read.h> -+#include "dvdread/nav_types.h" -+#include "dvdread/ifo_types.h" -+#include "dvdread/ifo_read.h" - #include "dvdnav/dvdnav.h" - - #include "decoder.h" -diff -Naur k9copy.orig/src/libdvdnav-NOW/vm/vm.c k9copy/src/libdvdnav-NOW/vm/vm.c ---- k9copy.orig/src/libdvdnav-NOW/vm/vm.c 2014-09-29 11:50:54.000000000 -0400 -+++ k9copy/src/libdvdnav-NOW/vm/vm.c 2020-12-24 10:48:11.141907741 -0500 -@@ -37,9 +37,9 @@ - #include <sys/time.h> - #include <fcntl.h> - --#include <dvdread/nav_types.h> --#include <dvdread/ifo_types.h> --#include <dvdread/ifo_read.h> -+#include "dvdread/nav_types.h" -+#include "dvdread/ifo_types.h" -+#include "dvdread/ifo_read.h" - #include "dvdnav/dvdnav.h" - - #include "decoder.h" -diff -Naur k9copy.orig/src/libdvdnav-NOW/vm/vmcmd.c k9copy/src/libdvdnav-NOW/vm/vmcmd.c ---- k9copy.orig/src/libdvdnav-NOW/vm/vmcmd.c 2014-09-29 11:50:54.000000000 -0400 -+++ k9copy/src/libdvdnav-NOW/vm/vmcmd.c 2020-12-24 10:48:11.141907741 -0500 -@@ -31,8 +31,8 @@ - #include <sys/time.h> - - #include "dvdnav/dvdnav.h" --#include <dvdread/nav_types.h> --#include <dvdread/ifo_types.h> -+#include "dvdread/nav_types.h" -+#include "dvdread/ifo_types.h" - #include "decoder.h" - #include "vm.h" - #include "vmcmd.h" -diff -Naur k9copy.orig/src/libdvdnav-NOW/vm/vmget.c k9copy/src/libdvdnav-NOW/vm/vmget.c ---- k9copy.orig/src/libdvdnav-NOW/vm/vmget.c 2014-09-29 11:50:54.000000000 -0400 -+++ k9copy/src/libdvdnav-NOW/vm/vmget.c 2020-12-24 10:48:11.141907741 -0500 -@@ -31,9 +31,9 @@ - #include <string.h> - #include <stdlib.h> - --#include <dvdread/nav_types.h> --#include <dvdread/ifo_types.h> --#include <dvdread/ifo_read.h> -+#include "dvdread/nav_types.h" -+#include "dvdread/ifo_types.h" -+#include "dvdread/ifo_read.h" - #include "dvdnav/dvdnav.h" - - #include "decoder.h" diff --git a/multimedia/k9copy-reloaded/patches/k9copy-tempdir.patch b/multimedia/k9copy-reloaded/patches/k9copy-tempdir.patch deleted file mode 100644 index e9376cf291..0000000000 --- a/multimedia/k9copy-reloaded/patches/k9copy-tempdir.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- src/core/k9tools.cpp.org 2014-09-29 17:00:12.000000000 +0200 -+++ src/core/k9tools.cpp 2015-12-19 19:18:40.474442195 +0100 -@@ -48,7 +48,7 @@ - const QString k9Tools::getTempPath() { - QString sPath; - --sPath=QString("%1/%2/").arg(QDir::tempPath() + '/' + "k9copy/"); -+sPath=QString("%1/%2/").arg(QDir::tempPath(),"k9copy/"); - - return sPath; - } ---- src/vamps/k9fifo.cpp.org 2014-09-29 17:00:12.000000000 +0200 -+++ src/vamps/k9fifo.cpp 2015-12-19 19:04:18.616261661 +0100 -@@ -11,6 +11,8 @@ - // - #include "k9fifo.h" - #include <QDir> -+#include <errno.h> -+#include <KDebug> - - uint64_t k9MemoryFifo::count() { - return m_count; -@@ -134,12 +136,19 @@ - m_wait.wait(&m_mutex); - } - m_wfile->seek(m_fstart); -- m_wfile->write((const char*)_buffer,_size); -+ int rc=m_wfile->write((const char*)_buffer,_size) ; -+ if (rc != (int) _size) { -+ kFatal() << QString("error writing to tempfile (%1)").arg(strerror (errno)); -+ abort(); -+ } - m_fstart=m_wfile->pos(); - if (m_fstart > MAX_FILE_SIZE) { - m_wfile=new QTemporaryFile(QDir::cleanPath(m_output +"/k9b")); - m_wfile->setAutoRemove(true); -- m_wfile->open(); -+ if(m_wfile->open() == false) { -+ kFatal() << QString("error creating tempfile in %1 (%1)").arg(QDir::cleanPath(m_output +"/k9b"), strerror (errno)); -+ abort(); -+ } - m_queue.enqueue(m_wfile); - m_fstart=0; - } -@@ -190,12 +199,17 @@ - if (m_rfile) { - m_rfile->close(); - delete m_rfile; -+ m_rfile=NULL; - } - qDeleteAll(m_queue); - -+ - m_fstart=m_fend=0; - m_rfile=new QTemporaryFile(QDir::cleanPath(m_output +"/k9b")); - m_rfile->setAutoRemove(true); -- m_rfile->open(); -+ if(m_rfile->open() == false) { -+ kFatal() << QString("error creating tempfile in %1 (%1)").arg(QDir::cleanPath(m_output +"/k9b"), strerror (errno)); -+ abort(); -+ } - m_start=m_end=0; - } diff --git a/multimedia/k9copy-reloaded/patches/k9copy-uncheck-dvdauthor.patch b/multimedia/k9copy-reloaded/patches/k9copy-uncheck-dvdauthor.patch new file mode 100644 index 0000000000..58814b7941 --- /dev/null +++ b/multimedia/k9copy-reloaded/patches/k9copy-uncheck-dvdauthor.patch @@ -0,0 +1,12 @@ +diff -Naur k9copy.orig/src/core/k9config.cpp k9copy/src/core/k9config.cpp +--- k9copy.orig/src/core/k9config.cpp 2014-09-29 11:00:12.000000000 -0400 ++++ k9copy/src/core/k9config.cpp 2020-12-26 12:17:00.538310987 -0500 +@@ -100,7 +100,7 @@ + m_prefAutoBurn=group.readEntry("autoburn",false); + m_quickScan=group.readEntry("quickscan",true); + m_prefSize=group.readEntry("dvdsize",4400); +- m_useDvdAuthor=group.readEntry("useDvdAuthor",true); ++ m_useDvdAuthor=group.readEntry("useDvdAuthor",false); + m_keepMenus=group.readEntry("keepMenus",true); + m_prefDelTmpFiles=group.readEntry("deltmpfiles",false); + m_prefReadAhead=group.readEntry("readahead",-1); |