[SCM] xjadeo/master: Removed fix_warning.patch

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 12763c788c69855885026a20c60b553494d38d4d
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sun Jun 16 19:17:24 2013 +0200

    Removed fix_warning.patch

diff --git a/debian/patches/02-fix_warnings.patch b/debian/patches/02-fix_warnings.patch
deleted file mode 100644
index d271e6c..0000000
--- a/debian/patches/02-fix_warnings.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-Description: Warnings fix patch, cherry-picked from upstream git repo
-Author: robin at gareus.org
-Forwarded: no
-Last-Update: 2013-05-14
-
-Index: xjadeo/src/qt-gui/importprogress.cpp
-===================================================================
---- xjadeo.orig/src/qt-gui/importprogress.cpp	2012-08-26 00:58:13.261797569 +0200
-+++ xjadeo/src/qt-gui/importprogress.cpp	2013-05-14 23:17:54.860084251 +0200
-@@ -81,7 +81,7 @@
-   encoder.setReadChannel(QProcess::StandardError);
-   while(encoder.canReadLine()) {
-     QString msg = encoder.readLine();
--    qDebug(msg.toAscii().data());
-+    //qDebug(msg.toAscii().data());
-   }
- }
- 
-@@ -97,7 +97,7 @@
-     importProgressBar->setValue( indx );
- }
- 
--void ImportProgress::encodeFinished(int exitCode, QProcess::ExitStatus exitStatus)
-+void ImportProgress::encodeFinished(int /*exitCode*/, QProcess::ExitStatus /*exitStatus*/)
- {
-   if (encoder.exitStatus() != 0) {
-     QMessageBox::QMessageBox::warning(this, 
-Index: xjadeo/src/xjadeo/avinfo.c
-===================================================================
---- xjadeo.orig/src/xjadeo/avinfo.c	2012-08-26 00:58:13.261797569 +0200
-+++ xjadeo/src/xjadeo/avinfo.c	2013-05-14 23:27:01.108106462 +0200
-@@ -44,8 +44,12 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+
- #ifndef HAVE_WINDOWS
-+#include <inttypes.h>
- #include <sys/errno.h>
-+#else
-+#define PRId64 "I64d"
- #endif
- 
- #include <getopt.h>
-@@ -177,7 +181,7 @@
- #endif
- 
-   if (want_mode == 1) { /* duration only */
--    printf("%lld", secs);
-+    printf("%"PRId64"", secs);
-     return 0;
-   }
- 
-@@ -198,7 +202,7 @@
- 	hours = mins / 60;
- 	mins %= 60;
- 
--	printf("%02lld:%02lld:%02lld.%01lld - ", hours, mins, secs, (us * 10) / AV_TIME_BASE);
-+	printf("%02"PRId64":%02"PRId64":%02"PRId64".%01"PRId64" - ", hours, mins, secs, (us * 10) / AV_TIME_BASE);
- #if LIBAVFORMAT_BUILD < 4624 
- 	printf("fps:%.2f ", (double) codec->frame_rate / (double) codec->frame_rate_base);
- #elif LIBAVFORMAT_BUILD <= 4629
-@@ -232,7 +236,7 @@
- #endif
-       p = avcodec_find_decoder(codec->codec_id);
-       if (codec->width) {
--	printf("%lld,", secs);
-+	printf("%"PRId64",", secs);
- 	printf("%.2f,",1.0/av_q2d(st->time_base));
- #if LIBAVFORMAT_BUILD < 4624 
- 	printf("%.2f,", (double) codec->frame_rate / (double) codec->frame_rate_base);
-@@ -263,8 +267,8 @@
-   printf("<av>\n");
-   printf("  <xmlversion>0.2</xmlversion>\n");
-   printf("  <filename>%s</filename>\n", ic->filename);
--  printf("  <length>%lld</length>\n", secs);
--  printf("  <duration>%lld</duration>\n", ic->duration);
-+  printf("  <length>%"PRId64"</length>\n", secs);
-+  printf("  <duration>%"PRId64"</duration>\n", ic->duration);
-   printf("  <avtimebase>%d</avtimebase>\n", AV_TIME_BASE);
- 
-   us = ic->duration % AV_TIME_BASE;
-@@ -273,12 +277,12 @@
-   hours = mins / 60;
-   mins %= 60;
- 
--  printf("  <time>%02lld:%02lld:%02lld.%01lld</time>\n", hours, mins, secs, (us * 10) / AV_TIME_BASE);
-+  printf("  <time>%02"PRId64":%02"PRId64":%02"PRId64".%01"PRId64"</time>\n", hours, mins, secs, (us * 10) / AV_TIME_BASE);
-   printf("  <bitrate>%d</bitrate>\n", ic->bit_rate);
- #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 0)
--  printf("  <size>%lld</size>\n", ic->file_size);
-+  printf("  <size>%"PRId64"</size>\n", ic->file_size);
- #endif
--  printf("  <startoffset>%lld</startoffset>\n", ic->start_time);
-+  printf("  <startoffset>%"PRId64"</startoffset>\n", ic->start_time);
- #if LIBAVFORMAT_BUILD < 3473920
-   if (ic->title) printf("  <title>%s</title>\n", ic->title);
- 
-@@ -341,7 +345,7 @@
-     if (p) printf("    <codec>%s</codec>\n", p->name);
-     else printf("    <codec>unknown</codec>\n");
- 
--    printf("    <duration>%lld</duration>\n", st->duration);
-+    printf("    <duration>%"PRId64"</duration>\n", st->duration);
-     printf("    <timebase>\n      <numerator>%d</numerator>\n", st->time_base.num);
-     printf("      <denominator>%d</denominator>\n    </timebase>\n", st->time_base.den);
-     printf("    <timerate>%.2f</timerate>\n", 1.0/av_q2d(st->time_base));
diff --git a/debian/patches/series b/debian/patches/series
index f8e0724..6db4c22 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-02-fix_warnings.patch
 01-misspelling.patch

-- 
xjadeo packaging