From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Aug 5 23:40:02 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 26815106567B for ; Tue, 5 Aug 2008 23:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 022C38FC36 for ; Tue, 5 Aug 2008 23:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m75Ne1vX021213 for ; Tue, 5 Aug 2008 23:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m75Ne1qQ021212; Tue, 5 Aug 2008 23:40:01 GMT (envelope-from gnats) Resent-Date: Tue, 5 Aug 2008 23:40:01 GMT Resent-Message-Id: <200808052340.m75Ne1qQ021212@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Diego Depaoli Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CC2431065674 for ; Tue, 5 Aug 2008 23:38:47 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id B9B6D8FC19 for ; Tue, 5 Aug 2008 23:38:47 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m75NclWw085469 for ; Tue, 5 Aug 2008 23:38:47 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m75Ncl7f085468; Tue, 5 Aug 2008 23:38:47 GMT (envelope-from nobody) Message-Id: <200808052338.m75Ncl7f085468@www.freebsd.org> Date: Tue, 5 Aug 2008 23:38:47 GMT From: Diego Depaoli To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/126288: [PATCH] multimedia/smile update to 0.6.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Aug 2008 23:40:02 -0000 >Number: 126288 >Category: ports >Synopsis: [PATCH] multimedia/smile update to 0.6.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Aug 05 23:40:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Diego Depaoli >Release: FreeBSD Current >Organization: >Environment: >Description: Update to 0.6.1 version >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/smile/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- Makefile 28 Jul 2008 19:16:54 -0000 1.1 +++ Makefile 5 Aug 2008 22:44:29 -0000 @@ -6,28 +6,25 @@ # PORTNAME= smile -PORTVERSION= 0.3.2 +PORTVERSION= 0.6.1 CATEGORIES= multimedia kde -MASTER_SITES= http://www.mandrivalinux-online.eu/smile/ \ - http://www.amdmi3.ru/distfiles/ \ - ${MASTER_SITE_LOCAL:S|%SUBDIR%|amdmi3|} +MASTER_SITES= http://download.tuxfamily.org/smiletool/ MAINTAINER= trebestie@gmail.com COMMENT= Slideshow Maker in Linux Environment RUN_DEPENDS= sox>=14.0:${PORTSDIR}/audio/sox \ mencoder:${PORTSDIR}/multimedia/mencoder \ - mplayer:${PORTSDIR}/multimedia/mplayer + mplayer:${PORTSDIR}/multimedia/mplayer \ + ImageMagick>=6.4:${PORTSDIR}/graphics/ImageMagick USE_QT_VER= 4 QT_COMPONENTS= qmake_build gui corelib rcc_build moc_build uic_build \ - opengl + opengl webkit MAKE_ENV+= QTDIR=${QT_PREFIX} WRKSRC= ${WRKDIR}/${PORTNAME} -SUB_FILES= smile.sh - DESKTOP_ENTRIES="Smile" \ "Slideshow Maker in Linux environment" \ "smile.png" \ @@ -36,7 +33,8 @@ false post-patch: - @${REINPLACE_CMD} -e 's|bash|sh|g' ${WRKSRC}/mainfrm.cpp + @${REINPLACE_CMD} -e 's|bash|sh|g' ${WRKSRC}/mainfrm.cpp \ + ${WRKSRC}/render.cpp @${RM} -f ${WRKSRC}/ui_*.h ${WRKSRC}/moc_*.cpp ${WRKSRC}/qrc_*.cpp do-configure: @@ -48,7 +46,6 @@ ${INSTALL_DATA} ${WRKSRC}/*.qm ${DATADIR}/ ${INSTALL_DATA} ${WRKSRC}/Interface/Theme/smile.png ${PREFIX}/share/pixmaps/smile.png ${INSTALL_PROGRAM} ${WRKSRC}/smile ${DATADIR}/ - ${LN} -fs smile_en.qm ${DATADIR}/smile.qm - ${INSTALL_SCRIPT} ${WRKDIR}/smile.sh ${PREFIX}/bin/smile + ${LN} -fs ${DATADIR}/smile ${PREFIX}/bin/ .include Index: distinfo =================================================================== RCS file: /home/pcvs/ports/multimedia/smile/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- distinfo 28 Jul 2008 19:16:54 -0000 1.1 +++ distinfo 5 Aug 2008 22:44:29 -0000 @@ -1,3 +1,3 @@ -MD5 (smile-0.3.2.tar.gz) = a9a9ed749b55b30550abb883aad9d264 -SHA256 (smile-0.3.2.tar.gz) = 4c40ae67c54b6b10dc04ff754b669f6e2d02e184a90bfe5a61eade3433639349 -SIZE (smile-0.3.2.tar.gz) = 3187837 +MD5 (smile-0.6.1.tar.gz) = b2214a239af71dcaadd08f03fc20f950 +SHA256 (smile-0.6.1.tar.gz) = eb8814e713a5a0848d2a61b83f90ff11cb4cbe0a6921dd3ba7458b29b5cdb401 +SIZE (smile-0.6.1.tar.gz) = 6166796 Index: pkg-descr =================================================================== RCS file: /home/pcvs/ports/multimedia/smile/pkg-descr,v retrieving revision 1.1 diff -u -r1.1 pkg-descr --- pkg-descr 28 Jul 2008 19:16:54 -0000 1.1 +++ pkg-descr 5 Aug 2008 22:44:29 -0000 @@ -1,3 +1,4 @@ Smile - Slideshow Maker in Linux Environment -WWW: http://www.kde-apps.org/content/show.php/SMILE?content=83276 +WWW: http://smile.tuxfamily.org + http://www.kde-apps.org/content/show.php/SMILE?content=83276 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/multimedia/smile/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- pkg-plist 28 Jul 2008 19:16:54 -0000 1.1 +++ pkg-plist 5 Aug 2008 22:44:29 -0000 @@ -3,6 +3,14 @@ %%DATADIR%%/BIB_ManSlide/Luma/MINI_Recouvrement_haut.png %%DATADIR%%/BIB_ManSlide/Luma/MINI_Recouvrement_droite.png %%DATADIR%%/BIB_ManSlide/Luma/MINI_Zigzag_001.png +%%DATADIR%%/BIB_ManSlide/Luma/Coeur.png +%%DATADIR%%/BIB_ManSlide/Luma/MINI_Coeur.png +%%DATADIR%%/BIB_ManSlide/Luma/Helice_002.png +%%DATADIR%%/BIB_ManSlide/Luma/MINI_Helice_002.png +%%DATADIR%%/BIB_ManSlide/Luma/MINI_Helice_001.png +%%DATADIR%%/BIB_ManSlide/Luma/Brule.png +%%DATADIR%%/BIB_ManSlide/Luma/MINI_Brule.png +%%DATADIR%%/BIB_ManSlide/Luma/Helice_001.png %%DATADIR%%/BIB_ManSlide/Luma/Spirale_001.png %%DATADIR%%/BIB_ManSlide/Luma/MINI_Spirale_001.png %%DATADIR%%/BIB_ManSlide/Luma/Recouvrement_bandes_horizontales.png @@ -37,6 +45,26 @@ %%DATADIR%%/BIB_ManSlide/Luma/Damier_001.png %%DATADIR%%/BIB_ManSlide/Luma/MINI_Damier_002.png %%DATADIR%%/BIB_ManSlide/Luma/MINI_Damier_003.png +%%DATADIR%%/BIB_ManSlide/Luma/Pattern_002.png +%%DATADIR%%/BIB_ManSlide/Luma/Pattern_003.png +%%DATADIR%%/BIB_ManSlide/Luma/MINI_Zigzag_003.png +%%DATADIR%%/BIB_ManSlide/Luma/MINI_Pendule_002.png +%%DATADIR%%/BIB_ManSlide/Luma/MINI_Pattern_002.png +%%DATADIR%%/BIB_ManSlide/Luma/MINI_Nuages_001.png +%%DATADIR%%/BIB_ManSlide/Luma/MINI_Cercle_001.png +%%DATADIR%%/BIB_ManSlide/Luma/MINI_Pattern_003.png +%%DATADIR%%/BIB_ManSlide/Luma/MINI_Nuages_002.png +%%DATADIR%%/BIB_ManSlide/Luma/Nuages_002.png +%%DATADIR%%/BIB_ManSlide/Luma/Pendule_002.png +%%DATADIR%%/BIB_ManSlide/Luma/MINI_Spirale_003.png +%%DATADIR%%/BIB_ManSlide/Luma/MINI_Pendule_001.png +%%DATADIR%%/BIB_ManSlide/Luma/Nuages_001.png +%%DATADIR%%/BIB_ManSlide/Luma/Spirale_003.png +%%DATADIR%%/BIB_ManSlide/Luma/Zigzag_003.png +%%DATADIR%%/BIB_ManSlide/Luma/MINI_Pattern_001.png +%%DATADIR%%/BIB_ManSlide/Luma/Cercle_001.png +%%DATADIR%%/BIB_ManSlide/Luma/Pattern_001.png +%%DATADIR%%/BIB_ManSlide/Luma/Pendule_001.png %%DATADIR%%/Interface/Theme/1leftarrow.png %%DATADIR%%/Interface/Theme/mini_p_v.png %%DATADIR%%/Interface/Theme/player_stop.png @@ -57,10 +85,8 @@ %%DATADIR%%/Interface/Theme/bookmark.png %%DATADIR%%/Interface/Theme/2downarrow.png %%DATADIR%%/Interface/Theme/mini_f_a.png -%%DATADIR%%/Interface/Theme/audio_screen.png %%DATADIR%%/Interface/Theme/flag_green.png %%DATADIR%%/Interface/Theme/player_play.png -%%DATADIR%%/Interface/Theme/underconstruction.png %%DATADIR%%/Interface/Theme/color_M.png %%DATADIR%%/Interface/Theme/preferences_other.png %%DATADIR%%/Interface/Theme/camera_photo.png @@ -90,13 +116,11 @@ %%DATADIR%%/Interface/Theme/insertion.gif %%DATADIR%%/Interface/Theme/preferences_system.png %%DATADIR%%/Interface/Theme/filesaveas.png -%%DATADIR%%/Interface/Theme/zoom_out.png %%DATADIR%%/Interface/Theme/copy.png %%DATADIR%%/Interface/Theme/color_C.png %%DATADIR%%/Interface/Theme/mini_p_h.png %%DATADIR%%/Interface/Theme/reload.png %%DATADIR%%/Interface/Theme/applications_graphics.png -%%DATADIR%%/Interface/Theme/text_speak.png %%DATADIR%%/Interface/Theme/player_end.png %%DATADIR%%/Interface/Theme/rotateX.png %%DATADIR%%/Interface/Theme/comment.png @@ -123,14 +147,54 @@ %%DATADIR%%/Interface/Theme/nuage.png %%DATADIR%%/Interface/Theme/nullpixmap.png %%DATADIR%%/Interface/Theme/puzzle.png +%%DATADIR%%/Interface/Theme/1uparrow.png +%%DATADIR%%/Interface/Theme/1downarrow.png %%DATADIR%%/Interface/Theme/soleil.png +%%DATADIR%%/Interface/Theme/brush_nuage.png +%%DATADIR%%/Interface/Theme/brush_etoile.png +%%DATADIR%%/Interface/Theme/brush_branche.png +%%DATADIR%%/Interface/Theme/brush_coeur.png +%%DATADIR%%/Interface/Theme/brush_girl.png +%%DATADIR%%/Interface/Theme/brush_ronde.png +%%DATADIR%%/Interface/Theme/brush_fleur.png %%DATADIR%%/Interface/Theme/star.png +%%DATADIR%%/Interface/Theme/contents.png +%%DATADIR%%/Interface/Theme/help_about.png +%%DATADIR%%/Interface/Theme/addvideo.png +%%DATADIR%%/Interface/Theme/tools_report_bug.png +%%DATADIR%%/Interface/Theme/stock-eye-20.png +%%DATADIR%%/Interface/Theme/flag_grey.png +%%DATADIR%%/BIB_ManSlide/Help/doc_fr.html +%%DATADIR%%/BIB_ManSlide/Help/doc_en.html +%%DATADIR%%/BIB_ManSlide/Help/doc_it.html +%%DATADIR%%/BIB_ManSlide/Help/style.css +%%DATADIR%%/BIB_ManSlide/Help/gpl-2.0.txt +%%DATADIR%%/BIB_ManSlide/Help/images/son.png +%%DATADIR%%/BIB_ManSlide/Help/images/Eggibault_3.png +%%DATADIR%%/BIB_ManSlide/Help/images/type.png +%%DATADIR%%/BIB_ManSlide/Help/images/mandvd.png +%%DATADIR%%/BIB_ManSlide/Help/images/.directory +%%DATADIR%%/BIB_ManSlide/Help/images/deplacer.png +%%DATADIR%%/BIB_ManSlide/Help/images/manslide.jpg +%%DATADIR%%/BIB_ManSlide/Help/images/boiboite.png +%%DATADIR%%/BIB_ManSlide/Help/images/outils.png +%%DATADIR%%/BIB_ManSlide/Help/images/time_av.png +%%DATADIR%%/BIB_ManSlide/Help/images/manslide2.jpg +%%DATADIR%%/BIB_ManSlide/Help/images/drapeau.png +%%DATADIR%%/BIB_ManSlide/Help/images/qdial.png +%%DATADIR%%/BIB_ManSlide/Help/images/couleur.png +%%DATADIR%%/BIB_ManSlide/Help/images/import.png +%%DATADIR%%/BIB_ManSlide/Help/images/lecture.png +%%DATADIR%%/BIB_ManSlide/Help/images/ban.png +%%DATADIR%%/BIB_ManSlide/Help/images/smile.png %%DATADIR%%/smile -%%DATADIR%%/smile.qm %%DATADIR%%/smile_en.qm %%DATADIR%%/smile_it.qm +%%DATADIR%%/smile_de.qm @dirrm %%DATADIR%%/BIB_ManSlide/Eff_sup @dirrm %%DATADIR%%/BIB_ManSlide/Luma +@dirrm %%DATADIR%%/BIB_ManSlide/Help/images +@dirrm %%DATADIR%%/BIB_ManSlide/Help @dirrm %%DATADIR%%/BIB_ManSlide/ @dirrm %%DATADIR%%/Interface/Theme @dirrm %%DATADIR%%/Interface Index: files/patch-mainfrm.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/smile/files/patch-mainfrm.cpp,v retrieving revision 1.1 diff -u -r1.1 patch-mainfrm.cpp --- files/patch-mainfrm.cpp 28 Jul 2008 19:16:54 -0000 1.1 +++ files/patch-mainfrm.cpp 5 Aug 2008 22:44:29 -0000 @@ -1,14 +1,14 @@ ---- mainfrm.cpp 2008-07-06 23:36:59.000000000 +0200 -+++ mainfrm.cpp.new 2008-07-06 23:38:27.000000000 +0200 -@@ -815,9 +815,9 @@ - QString program = "cp"; - QStringList arguments; +--- mainfrm.cpp 2008-08-04 10:44:08.000000000 +0200 ++++ mainfrm.cpp.new 2008-08-04 12:02:17.000000000 +0200 +@@ -1284,9 +1284,9 @@ + arguments << tempfolder->text(); + #else + program = "cp"; +- arguments << "-r"; ++ arguments << "-R"; + arguments << "-f"; +- arguments << QApplication::applicationDirPath() + "/BIB_ManSlide/"; ++ arguments << QApplication::applicationDirPath() + "/BIB_ManSlide"; + arguments << tempfolder->text(); + #endif ispreview = 4; -- arguments << "-r"; -+ arguments << "-R"; - arguments << "-f"; -- arguments << QApplication::applicationDirPath() + "/BIB_ManSlide/"; -+ arguments << QApplication::applicationDirPath() + "/BIB_ManSlide"; - arguments << tempfolder->text(); - myprocess_9.start( program, arguments ); - // Index: files/smile.sh.in =================================================================== RCS file: files/smile.sh.in diff -N files/smile.sh.in --- files/smile.sh.in 28 Jul 2008 19:16:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,4 +0,0 @@ -#!/bin/sh - -cd %%DATADIR%% || exit 1 -exec ./smile >Release-Note: >Audit-Trail: >Unformatted: