Ticket #38718: kdenlive.patch.diff

File kdenlive.patch.diff, 4.1 KB (added by mkae (Marko Käning), 11 years ago)
  • files/patch-src-stringMap.diff

     
    1 diff --git a/src/dvdwizard.h b/src/dvdwizard.h
    2 index 2aa6a55..cfeba33 100644
    3 --- src/dvdwizard.h
    4 +++ src/dvdwizard.h
    5 @@ -37,6 +37,8 @@
    6  #include "ui_dvdwizardstatus_ui.h"
    7  #include "ui_dvdwizardchapters_ui.h"
    8  
    9 +typedef QMap <QString, QRect> stringRectMap;
    10 +
    11  class DvdWizard : public QWizard
    12  {
    13      Q_OBJECT
    14 @@ -75,7 +77,7 @@ private:
    15      QMenu *m_burnMenu;
    16      void errorMessage(const QString &text);
    17      void infoMessage(const QString &text);
    18 -    void processDvdauthor(QString menuMovieUrl = QString(), QMap <QString, QRect> buttons = QMap <QString, QRect>(), QStringList buttonsTarget = QStringList());
    19 +    void processDvdauthor(QString menuMovieUrl = QString(), stringRectMap buttons = stringRectMap(), QStringList buttonsTarget = QStringList());
    20  
    21  private slots:
    22      void slotPageChanged(int page);
    23 diff --git a/src/kdenlivedoc.h b/src/kdenlivedoc.h
    24 index 955aee9..22aeac3 100644
    25 --- src/kdenlivedoc.h
    26 +++ src/kdenlivedoc.h
    27 @@ -83,7 +83,7 @@ Q_OBJECT public:
    28       *
    29       * If the clip wasn't added before, it tries to add it to the project. */
    30      bool addClipInfo(QDomElement elem, QDomElement orig, QString clipId);
    31 -    void slotAddClipList(const KUrl::List urls, stringMap data = QMap <QString, QString>());
    32 +    void slotAddClipList(const KUrl::List urls, stringMap data = stringMap());
    33      void deleteClip(const QString &clipId);
    34      int getFramePos(QString duration);
    35      DocClipBase *getBaseClip(const QString &clipId);
    36 diff --git a/src/projectlist.h b/src/projectlist.h
    37 index 5edc32e..021058d 100644
    38 --- src/projectlist.h
    39 +++ src/projectlist.h
    40 @@ -423,7 +423,7 @@ private:
    41      /** @brief Get the list of job names for current clip. */
    42      QStringList getPendingJobs(const QString &id);
    43      /** @brief Start an MLT process job. */
    44 -    void processClipJob(QStringList ids, const QString&destination, bool autoAdd, QStringList jobParams, const QString &description, QMap <QString, QString>extraParams = QMap <QString, QString>());
    45 +    void processClipJob(QStringList ids, const QString&destination, bool autoAdd, QStringList jobParams, const QString &description, stringMap extraParams = stringMap());
    46      /** @brief Create rounded shape pixmap for project tree thumb. */
    47      QPixmap roundedPixmap(QImage img);
    48      QPixmap roundedPixmap(QPixmap source);
    49 diff --git a/src/projecttree/meltjob.h b/src/projecttree/meltjob.h
    50 index f4c5f05..22dd034 100644
    51 --- src/projecttree/meltjob.h
    52 +++ src/projecttree/meltjob.h
    53 @@ -41,7 +41,7 @@ class MeltJob : public AbstractClipJob
    54      Q_OBJECT
    55  
    56  public:
    57 -    MeltJob(CLIPTYPE cType, const QString &id, QStringList parameters, QMap <QString, QString> extraParams = QMap <QString, QString>());
    58 +    MeltJob(CLIPTYPE cType, const QString &id, QStringList parameters, stringMap extraParams = stringMap());
    59      virtual ~ MeltJob();
    60      const QString destination() const;
    61      void startJob();
  • Portfile

     
    55PortGroup           kde4 1.1
    66
    77name                kdenlive
    8 version             0.9.4
     8version             0.9.6
    99categories          multimedia
    1010maintainers         dennedy.org:dan
    1111license             GPL-2+
     
    2121master_sites        http://download.kde.org/stable/${name}/${version}/src/
    2222platforms           darwin
    2323
    24 checksums           sha1    a91a6c02a5847d3e21f2713b1fba3db413ccaf62 \
    25                     rmd160  cb381f72146dbf5cd7657aa86b091df7578812d7
     24checksums           sha1    0b9de2dd1e77140020bf3efc9c88105d4dcf5c8d \
     25                    rmd160  0aaf8911073b82725998a8f18426b7f4189e25f0
    2626
    2727depends_lib-append  port:mlt \
    2828                    port:kdelibs4 \
     
    3434# mlt is not universal
    3535universal_variant   no
    3636
    37 patchfiles          patch-src-stringMap.diff
    38 
    3937configure.args-append -DNO_JOGSHUTTLE=1
    4038
    4139build.env-append    -DNO_JOGSHUTTLE=1