Request 277 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 277 (accepted)

update and fixes

Created by etamPL over 11 years ago
In state accepted

Submit imageshack-uploader

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

imageshack-uploader.changes Changed

imageshack-uploader.spec Changed

@@ -1,20 +1,27 @@
-# norootforbuild
-
-Name:          imageshack-uploader
-Summary:       Imageshack Uploader
-Version:       2.2.0
-Release:       1
-Group:         Productivity/Networking/File-Sharing
-Url:           http://code.google.com/p/imageshack-uploader/
-Source0:       imageshack-uploader-%{version}.tar.bz2
-# PATCH-FEATURE-OPENSUSE imageshack-uploader-2.2.0-nodevkey.patch adam@mizerski.pl -- I don't have developer key. It works without it anyway.
-Patch0:        %{name}-2.2.0-nodevkey.patch
-# PATCH-FIX-UPSTREAM imageshack-uploader-2.2.0-av_log_level.patch adam@mizerski.pl -- Fixes deprecated usage of av_log_level
-Patch1:        %{name}-2.2.0-av_log_level.patch
-BuildRoot:     %{_tmppath}/%{name}-%{version}-build
-License:       BSD-3
-BuildRequires: gcc-c++ libffmpeg_oldabi-devel update-desktop-files hicolor-icon-theme
-BuildRequires: libqt4-devel >= 4.5
+Name:           imageshack-uploader
+# hg rev 2bd8dc6214d7
+Version:        2.3.0
+Release:        1
+License:        BSD-3-Clause
+Summary:        Imageshack Uploader
+Url:            http://code.google.com/p/imageshack-uploader/
+Group:          Productivity/Networking/File-Sharing
+Source0:        imageshack-uploader-%{version}.tar.bz2
+# Patches are from http://anonscm.debian.org/loggerhead/collab-maint/imageshack-uploader/files/head:/debian/patches/
+# PATCH-FIX-UPSTREAM imageshack-uploader-2.3.0-g++47.patch adam@mizerski.pl -- add missing header
+Patch0:         %{name}-2.3.0-g++47.patch
+# 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
+Patch1:         %{name}-2.3.0-1001-fix-ffmpeg-6.0.diff
+# 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
+Patch2:         %{name}-2.3.0-1002-fix-FTBFS-libav-0.7.diff
+# 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
+Patch3:         %{name}-2.3.0-fix-fail-to-login.patch
+BuildRequires:  gcc-c++
+BuildRequires:  hicolor-icon-theme
+BuildRequires:  libffmpeg_oldabi-devel
+BuildRequires:  libqt4-devel >= 4.5
+BuildRequires:  update-desktop-files
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 The uploader allows to upload images and videos in bulk to http://imageshack.us/ web site.
@@ -24,35 +31,32 @@
 %setup0 -q
 %patch0 -p1
 %patch1 -p1
-qmake QMAKE_CFLAGS="%optflags" QMAKE_CXXFLAGS="%optflags"
+%patch2 -p1
+%patch3 -p1
+# developer key taken from http://anonscm.debian.org/loggerhead/collab-maint/imageshack-uploader/annotate/head:/debian/rules
+IMAGESHACK_DEVELOPER_KEY="139ACLMVba0ed423487bdf82ee74c68020d4b198" qmake QMAKE_CFLAGS="%{optflags}" QMAKE_CXXFLAGS="%{optflags}"
 
 %build
-%__make %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%__make INSTALL_ROOT=%buildroot install
-%__mkdir_p %buildroot%{_datadir}/imageshack-uploader/translations/
-%__cp translations/*.qm %buildroot%{_datadir}/imageshack-uploader/translations/
+make INSTALL_ROOT=%{buildroot} install
+mkdir -p %{buildroot}%{_datadir}/imageshack-uploader/translations/
+cp translations/*.qm %{buildroot}%{_datadir}/imageshack-uploader/translations/
 %suse_update_desktop_file -r -n imageshackuploader Network FileTransfer
 
-%clean
-%__rm -rf %buildroot
-
-
-%if 0%{?suse_version} >= 1140
 %post
 %icon_theme_cache_post || true
+
 %postun
 %icon_theme_cache_postun || true
-%endif
 
 
 %files
 %defattr(-,root,root)
 %{_bindir}/%{name}
 %dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/translations
-%{_datadir}/%{name}/translations/*
+%{_datadir}/%{name}/translations/
 %{_datadir}/pixmaps/imageshack.png
 %{_datadir}/applications/imageshackuploader.desktop

imageshack-uploader-2.2.0-av_log_level.patch Deleted

imageshack-uploader-2.2.0-nodevkey.patch Deleted

@@ -1,35 +0,0 @@
-diff -rupN imageshack-uploader-2.2.0/httprequest.cpp imageshack-uploader-2.2.0_mod/httprequest.cpp
---- imageshack-uploader-2.2.0/httprequest.cpp	2009-10-11 22:01:26.000000000 +0200
-+++ imageshack-uploader-2.2.0_mod/httprequest.cpp	2009-10-11 22:13:31.000000000 +0200
-@@ -128,7 +128,6 @@ QVector<QPair<QString, QString> > HTTPRe
-         }
-         if (media.data()->getRemoveSize()) fields << qMakePair(QString("rembar"), QString("1"));
-     }
--    fields << qMakePair(QString("key"), QString(DEVELOPER_KEY));
-     qDebug() << fields;
-     return fields;
- }
-diff -rupN imageshack-uploader-2.2.0/imageshack.pro imageshack-uploader-2.2.0_mod/imageshack.pro
---- imageshack-uploader-2.2.0/imageshack.pro	2009-10-11 22:01:26.000000000 +0200
-+++ imageshack-uploader-2.2.0_mod/imageshack.pro	2009-10-11 22:12:05.000000000 +0200
-@@ -20,9 +20,6 @@ UNIX_TRANSLATIONS_DIR = "/usr/share/imag
- DEFINES += UNIX_TRANSLATIONS_DIR="\\\"$$UNIX_TRANSLATIONS_DIR\\\""
- VERSION = 2.2.0
- DEFINES += VERSION="\\\"$$VERSION\\\""
--DEVKEY = $$(IMAGESHACK_DEVELOPER_KEY)
--isEmpty(DEVKEY):error(IMAGESHACK_DEVELOPER_KEY variable should be set for building)
--DEFINES += DEVELOPER_KEY="\\\"$$DEVKEY\\\""
- QMAKE_INFO_PLIST = imageshack.plist
- SOURCES += main.cpp \
-     mainwindow.cpp \
-diff -rupN imageshack-uploader-2.2.0/twitterclient.cpp imageshack-uploader-2.2.0_mod/twitterclient.cpp
---- imageshack-uploader-2.2.0/twitterclient.cpp	2009-10-11 22:01:27.000000000 +0200
-+++ imageshack-uploader-2.2.0_mod/twitterclient.cpp	2009-10-11 22:14:00.000000000 +0200
-@@ -82,7 +82,6 @@ void TwitterClient::post(QString url, QS
-     data.append(qMakePair(QString("password"), pass));
-     data.append(qMakePair(QString("message"), text));
-     data.append(qMakePair(QString("url"), url));
--    data.append(qMakePair(QString("key"), QString(DEVELOPER_KEY)));
-     qDebug() << data;
-     http.post(QString("http://") + TWITTER_HOST + TWITTER_PATH, data);
-

imageshack-uploader-2.3.0-1001-fix-ffmpeg-6.0.diff Added

imageshack-uploader-2.3.0-1002-fix-FTBFS-libav-0.7.diff Added

@@ -0,0 +1,38 @@
+Description: fix FTBFS with libav 0.7 because deprecated values and functions
+ has been dropped
+Author: Fabrice Coutadeur <fabricesp@ubuntu.com>
+
+--- imageshack-uploader-2.2+hg20100408.d802dea89428.orig/ffmpeg_fas.c
++++ imageshack-uploader-2.2+hg20100408.d802dea89428/ffmpeg_fas.c
+@@ -228,7 +228,7 @@ fas_error_type fas_open_video (fas_conte
+   int stream_idx;
+   for (stream_idx = 0; stream_idx < fas_context->format_context->nb_streams; stream_idx++) 
+     {
+-      if (fas_context->format_context->streamsstream_idx->codec->codec_type == CODEC_TYPE_VIDEO)
++      if (fas_context->format_context->streamsstream_idx->codec->codec_type == AVMEDIA_TYPE_VIDEO)
+ 	{
+ 	  fas_context->stream_idx = stream_idx;
+ 	  fas_context->codec_context  = fas_context->format_context->streamsstream_idx->codec;
+@@ -382,7 +382,7 @@ fas_error_type fas_step_forward (fas_con
+ 	  /* note this -1 approach to setting the packet is a workaround for a common failure. setting 
+ 	     to 0 would work just incur a huge penalty in videos that needed -1. Might be worth testing.
+ 	  */
+-	  if (packet.flags & PKT_FLAG_KEY)
++	  if (packet.flags & AV_PKT_FLAG_KEY)
+ 	    {
+ 	      //fprintf(stderr, "Packet: (F:%d %lld %lld)\n", context->current_frame_index, packet.pts, packet.dts);
+ 	      
+@@ -392,8 +392,13 @@ fas_error_type fas_step_forward (fas_con
+ 		context->keyframe_packet_dts = context->previous_dts;
+ 	    }
+ 	  
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,23,0)
++          avcodec_decode_video2( context->codec_context, context->frame_buffer,
++                                        &frameFinished, &packet );
++#else
+ 	  avcodec_decode_video(context->codec_context, context->frame_buffer, &frameFinished,
+ 			       packet.data, packet.size);	
++#endif
+ 	  
+ 	  if (frameFinished)
+ 	    {

imageshack-uploader-2.3.0-fix-fail-to-login.patch Added

imageshack-uploader-2.3.0-g++47.patch Added

imageshack-uploader-2.2.0.tar.bz2 -> imageshack-uploader-2.3.0.tar.bz2 Changed

Build Results
RPM Lint

Refresh

Comments for request 277 0

Request History

etamPL created request over 11 years ago

update and fixes

mrdocs accepted request about 12 years ago

Looks good to me