Overview

Request 277 (accepted)

update and fixes

Submit package home:etam...hes:Extra / imageshack-uploader to package Extra / imageshack-uploader

imageshack-uploader.changes Changed
x
 
1
@@ -1,4 +1,19 @@
2
 -------------------------------------------------------------------
3
+Wed Sep 12 20:20:43 UTC 2012 - adam@mizerski.pl
4
+
5
+- update to 2.3.0 (hg rev 2bd8dc6214d7)
6
+- removed patches:
7
+  * imageshack-uploader-2.2.0-av_log_level.patch
8
+  * imageshack-uploader-2.2.0-fix-fail-to-login.patch
9
+  * imageshack-uploader-2.2.0-nodevkey.patch
10
+- added paches
11
+  * imageshack-uploader-2.3.0-1001-fix-ffmpeg-6.0.diff
12
+  * imageshack-uploader-2.3.0-1002-fix-FTBFS-libav-0.7.diff
13
+  * imageshack-uploader-2.3.0-fix-fail-to-login.patch
14
+  * imageshack-uploader-2.3.0-g++47.patch
15
+- added developer key taken from debian build
16
+
17
+-------------------------------------------------------------------
18
 Wed Feb 23 22:16:20 UTC 2011 - adam@mizerski.pl
19
 
20
 - new package
21
imageshack-uploader.spec Changed
92
 
1
@@ -1,20 +1,27 @@
2
-# norootforbuild
3
-
4
-Name:          imageshack-uploader
5
-Summary:       Imageshack Uploader
6
-Version:       2.2.0
7
-Release:       1
8
-Group:         Productivity/Networking/File-Sharing
9
-Url:           http://code.google.com/p/imageshack-uploader/
10
-Source0:       imageshack-uploader-%{version}.tar.bz2
11
-# PATCH-FEATURE-OPENSUSE imageshack-uploader-2.2.0-nodevkey.patch adam@mizerski.pl -- I don't have developer key. It works without it anyway.
12
-Patch0:        %{name}-2.2.0-nodevkey.patch
13
-# PATCH-FIX-UPSTREAM imageshack-uploader-2.2.0-av_log_level.patch adam@mizerski.pl -- Fixes deprecated usage of av_log_level
14
-Patch1:        %{name}-2.2.0-av_log_level.patch
15
-BuildRoot:     %{_tmppath}/%{name}-%{version}-build
16
-License:       BSD-3
17
-BuildRequires: gcc-c++ libffmpeg_oldabi-devel update-desktop-files hicolor-icon-theme
18
-BuildRequires: libqt4-devel >= 4.5
19
+Name:           imageshack-uploader
20
+# hg rev 2bd8dc6214d7
21
+Version:        2.3.0
22
+Release:        1
23
+License:        BSD-3-Clause
24
+Summary:        Imageshack Uploader
25
+Url:            http://code.google.com/p/imageshack-uploader/
26
+Group:          Productivity/Networking/File-Sharing
27
+Source0:        imageshack-uploader-%{version}.tar.bz2
28
+# Patches are from http://anonscm.debian.org/loggerhead/collab-maint/imageshack-uploader/files/head:/debian/patches/
29
+# PATCH-FIX-UPSTREAM imageshack-uploader-2.3.0-g++47.patch adam@mizerski.pl -- add missing header
30
+Patch0:         %{name}-2.3.0-g++47.patch
31
+# PATCH-FIX-OPENSUSE imageshack-uploader-2.3.0-1001-fix-ffmpeg-6.0.diff fabricesp@ubuntu.com -- fixes a compilation error with ffmpeg 6.0: "'av_log_level' undeclared
32
+Patch1:         %{name}-2.3.0-1001-fix-ffmpeg-6.0.diff
33
+# PATCH-FIX-OPENSUSE imageshack-uploader-2.3.0-1002-fix-FTBFS-libav-0.7.diff fabricesp@ubuntu.com -- fix FTBFS with libav 0.7 because deprecated values and functions has been dropped
34
+Patch2:         %{name}-2.3.0-1002-fix-FTBFS-libav-0.7.diff
35
+# PATCH-FIX-UPSTREAM imageshack-uploader-2.3.0-fix-fail-to-login.patch dr3mro@gmail.com -- https://code.google.com/p/imageshack-uploader/issues/detail?id=243
36
+Patch3:         %{name}-2.3.0-fix-fail-to-login.patch
37
+BuildRequires:  gcc-c++
38
+BuildRequires:  hicolor-icon-theme
39
+BuildRequires:  libffmpeg_oldabi-devel
40
+BuildRequires:  libqt4-devel >= 4.5
41
+BuildRequires:  update-desktop-files
42
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
43
 
44
 %description
45
 The uploader allows to upload images and videos in bulk to http://imageshack.us/ web site.
46
@@ -24,35 +31,32 @@
47
 %setup0 -q
48
 %patch0 -p1
49
 %patch1 -p1
50
-qmake QMAKE_CFLAGS="%optflags" QMAKE_CXXFLAGS="%optflags"
51
+%patch2 -p1
52
+%patch3 -p1
53
+# developer key taken from http://anonscm.debian.org/loggerhead/collab-maint/imageshack-uploader/annotate/head:/debian/rules
54
+IMAGESHACK_DEVELOPER_KEY="139ACLMVba0ed423487bdf82ee74c68020d4b198" qmake QMAKE_CFLAGS="%{optflags}" QMAKE_CXXFLAGS="%{optflags}"
55
 
56
 %build
57
-%__make %{?_smp_mflags}
58
+make %{?_smp_mflags}
59
 
60
 %install
61
-%__make INSTALL_ROOT=%buildroot install
62
-%__mkdir_p %buildroot%{_datadir}/imageshack-uploader/translations/
63
-%__cp translations/*.qm %buildroot%{_datadir}/imageshack-uploader/translations/
64
+make INSTALL_ROOT=%{buildroot} install
65
+mkdir -p %{buildroot}%{_datadir}/imageshack-uploader/translations/
66
+cp translations/*.qm %{buildroot}%{_datadir}/imageshack-uploader/translations/
67
 %suse_update_desktop_file -r -n imageshackuploader Network FileTransfer
68
 
69
-%clean
70
-%__rm -rf %buildroot
71
-
72
-
73
-%if 0%{?suse_version} >= 1140
74
 %post
75
 %icon_theme_cache_post || true
76
+
77
 %postun
78
 %icon_theme_cache_postun || true
79
-%endif
80
 
81
 
82
 %files
83
 %defattr(-,root,root)
84
 %{_bindir}/%{name}
85
 %dir %{_datadir}/%{name}
86
-%dir %{_datadir}/%{name}/translations
87
-%{_datadir}/%{name}/translations/*
88
+%{_datadir}/%{name}/translations/
89
 %{_datadir}/pixmaps/imageshack.png
90
 %{_datadir}/applications/imageshackuploader.desktop
91
 
92
imageshack-uploader-2.2.0-av_log_level.patch Deleted
23
 
1
@@ -1,21 +0,0 @@
2
-diff -rupN imageshack-uploader-2.2.0/ffmpeg_fas.c imageshack-uploader-2.2.0_mod/ffmpeg_fas.c
3
---- imageshack-uploader-2.2.0/ffmpeg_fas.c 2009-10-11 22:01:26.000000000 +0200
4
-+++ imageshack-uploader-2.2.0_mod/ffmpeg_fas.c 2009-10-11 22:06:18.000000000 +0200
5
-@@ -116,7 +116,7 @@ void fas_set_logging (fas_boolean_type l
6
-       SHOW_ERROR_MESSAGES = 1;
7
-       SHOW_WARNING_MESSAGES = 1;
8
- #ifndef _WIN32
9
--      av_log_level = AV_LOG_INFO;
10
-+      av_log_set_level(AV_LOG_INFO);
11
- #endif
12
-     }
13
-   else 
14
-@@ -124,7 +124,7 @@ void fas_set_logging (fas_boolean_type l
15
-       SHOW_ERROR_MESSAGES = 0;
16
-       SHOW_WARNING_MESSAGES = 0;
17
- #ifndef _WIN32
18
--      av_log_level = AV_LOG_QUIET;
19
-+      av_log_set_level(AV_LOG_QUIET);
20
- #endif
21
-     }  
22
- }
23
imageshack-uploader-2.2.0-nodevkey.patch Deleted
37
 
1
@@ -1,35 +0,0 @@
2
-diff -rupN imageshack-uploader-2.2.0/httprequest.cpp imageshack-uploader-2.2.0_mod/httprequest.cpp
3
---- imageshack-uploader-2.2.0/httprequest.cpp  2009-10-11 22:01:26.000000000 +0200
4
-+++ imageshack-uploader-2.2.0_mod/httprequest.cpp  2009-10-11 22:13:31.000000000 +0200
5
-@@ -128,7 +128,6 @@ QVector<QPair<QString, QString> > HTTPRe
6
-         }
7
-         if (media.data()->getRemoveSize()) fields << qMakePair(QString("rembar"), QString("1"));
8
-     }
9
--    fields << qMakePair(QString("key"), QString(DEVELOPER_KEY));
10
-     qDebug() << fields;
11
-     return fields;
12
- }
13
-diff -rupN imageshack-uploader-2.2.0/imageshack.pro imageshack-uploader-2.2.0_mod/imageshack.pro
14
---- imageshack-uploader-2.2.0/imageshack.pro   2009-10-11 22:01:26.000000000 +0200
15
-+++ imageshack-uploader-2.2.0_mod/imageshack.pro   2009-10-11 22:12:05.000000000 +0200
16
-@@ -20,9 +20,6 @@ UNIX_TRANSLATIONS_DIR = "/usr/share/imag
17
- DEFINES += UNIX_TRANSLATIONS_DIR="\\\"$$UNIX_TRANSLATIONS_DIR\\\""
18
- VERSION = 2.2.0
19
- DEFINES += VERSION="\\\"$$VERSION\\\""
20
--DEVKEY = $$(IMAGESHACK_DEVELOPER_KEY)
21
--isEmpty(DEVKEY):error(IMAGESHACK_DEVELOPER_KEY variable should be set for building)
22
--DEFINES += DEVELOPER_KEY="\\\"$$DEVKEY\\\""
23
- QMAKE_INFO_PLIST = imageshack.plist
24
- SOURCES += main.cpp \
25
-     mainwindow.cpp \
26
-diff -rupN imageshack-uploader-2.2.0/twitterclient.cpp imageshack-uploader-2.2.0_mod/twitterclient.cpp
27
---- imageshack-uploader-2.2.0/twitterclient.cpp    2009-10-11 22:01:27.000000000 +0200
28
-+++ imageshack-uploader-2.2.0_mod/twitterclient.cpp    2009-10-11 22:14:00.000000000 +0200
29
-@@ -82,7 +82,6 @@ void TwitterClient::post(QString url, QS
30
-     data.append(qMakePair(QString("password"), pass));
31
-     data.append(qMakePair(QString("message"), text));
32
-     data.append(qMakePair(QString("url"), url));
33
--    data.append(qMakePair(QString("key"), QString(DEVELOPER_KEY)));
34
-     qDebug() << data;
35
-     http.post(QString("http://") + TWITTER_HOST + TWITTER_PATH, data);
36
- 
37
imageshack-uploader-2.3.0-1001-fix-ffmpeg-6.0.diff Added
20
 
1
@@ -0,0 +1,18 @@
2
+--- a/ffmpeg_fas.c
3
++++ b/ffmpeg_fas.c
4
+@@ -80,6 +80,7 @@
5
+ 
6
+ } fas_context_type;
7
+ 
8
++static int av_log_level;
9
+ static char* invalid_error_code = "not a valid error code";
10
+ static char *gbl_error_stringsNUM_POSSIBLE_ERRORS =
11
+ {
12
+@@ -176,6 +177,7 @@
13
+   fas_set_logging(logging);
14
+   fas_set_format(format);
15
+   av_register_all();
16
++  av_log_level = av_log_get_level();
17
+   
18
+   return;
19
+ }
20
imageshack-uploader-2.3.0-1002-fix-FTBFS-libav-0.7.diff Added
40
 
1
@@ -0,0 +1,38 @@
2
+Description: fix FTBFS with libav 0.7 because deprecated values and functions
3
+ has been dropped
4
+Author: Fabrice Coutadeur <fabricesp@ubuntu.com>
5
+
6
+--- imageshack-uploader-2.2+hg20100408.d802dea89428.orig/ffmpeg_fas.c
7
++++ imageshack-uploader-2.2+hg20100408.d802dea89428/ffmpeg_fas.c
8
+@@ -228,7 +228,7 @@ fas_error_type fas_open_video (fas_conte
9
+   int stream_idx;
10
+   for (stream_idx = 0; stream_idx < fas_context->format_context->nb_streams; stream_idx++) 
11
+     {
12
+-      if (fas_context->format_context->streamsstream_idx->codec->codec_type == CODEC_TYPE_VIDEO)
13
++      if (fas_context->format_context->streamsstream_idx->codec->codec_type == AVMEDIA_TYPE_VIDEO)
14
+   {
15
+     fas_context->stream_idx = stream_idx;
16
+     fas_context->codec_context  = fas_context->format_context->streamsstream_idx->codec;
17
+@@ -382,7 +382,7 @@ fas_error_type fas_step_forward (fas_con
18
+     /* note this -1 approach to setting the packet is a workaround for a common failure. setting 
19
+        to 0 would work just incur a huge penalty in videos that needed -1. Might be worth testing.
20
+     */
21
+-    if (packet.flags & PKT_FLAG_KEY)
22
++    if (packet.flags & AV_PKT_FLAG_KEY)
23
+       {
24
+         //fprintf(stderr, "Packet: (F:%d %lld %lld)\n", context->current_frame_index, packet.pts, packet.dts);
25
+         
26
+@@ -392,8 +392,13 @@ fas_error_type fas_step_forward (fas_con
27
+       context->keyframe_packet_dts = context->previous_dts;
28
+       }
29
+     
30
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,23,0)
31
++          avcodec_decode_video2( context->codec_context, context->frame_buffer,
32
++                                        &frameFinished, &packet );
33
++#else
34
+     avcodec_decode_video(context->codec_context, context->frame_buffer, &frameFinished,
35
+                  packet.data, packet.size);   
36
++#endif
37
+     
38
+     if (frameFinished)
39
+       {
40
imageshack-uploader-2.3.0-fix-fail-to-login.patch Added
12
 
1
@@ -0,0 +1,10 @@
2
+--- imageshack-uploader-2.3.1.orig/httprequest.cpp
3
++++ imageshack-uploader-2.3.1/httprequest.cpp
4
+@@ -363,6 +363,7 @@ void HTTPRequest::post(QString url, QVec
5
+     }
6
+     QNetworkRequest req(url);
7
+     this->prepareNetworkRequest(req);
8
++    req.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
9
+     reply = qnam.post(req, data);
10
+     connectReply(SLOT(postReceiver()));
11
+ }
12
imageshack-uploader-2.3.0-g++47.patch Added
13
 
1
@@ -0,0 +1,11 @@
2
+diff -rupN imageshack-uploader-2.3.0/qtsingleapplication/qtlocalpeer.cpp imageshack-uploader-2.3.0_mod/qtsingleapplication/qtlocalpeer.cpp
3
+--- imageshack-uploader-2.3.0/qtsingleapplication/qtlocalpeer.cpp  2012-09-12 21:48:58.252016094 +0200
4
++++ imageshack-uploader-2.3.0_mod/qtsingleapplication/qtlocalpeer.cpp  2012-09-12 21:58:40.710078975 +0200
5
+@@ -58,6 +58,7 @@ static PProcessIdToSessionId pProcessIdT
6
+ #if defined(Q_OS_UNIX)
7
+ #include <time.h>
8
+ #endif
9
++#include <unistd.h>
10
+ 
11
+ namespace QtLP_Private {
12
+ #include "qtlockedfile.cpp"
13
imageshack-uploader-2.2.0.tar.bz2 -> imageshack-uploader-2.3.0.tar.bz2 Changed
Refresh
Refresh
Request History
Adam Mizerski's avatar

etamPL created request over 11 years ago

update and fixes


Peter Linnell's avatar

mrdocs accepted request over 12 years ago

Looks good to me