Ticket #51083: patch_qgit_2.9.diff

File patch_qgit_2.9.diff, 3.7 KB (added by ctreleaven (Craig Treleaven), 4 years ago)

Updated port patch

  • devel/qgit/Portfile

    diff --git a/devel/qgit/Portfile b/devel/qgit/Portfile
    index 7b8fe1c52ab..e27a73019a6 100644
    a b  
    11# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
    22
    33PortSystem          1.0
    4 PortGroup           qt4 1.0
     4PortGroup           github 1.0
     5PortGroup           cmake 1.1
     6PortGroup           qt5 1.0
     7
     8github.setup        tibirna qgit 2.9
     9github.master_sites ${github.homepage}/archive
     10checksums           rmd160  b629af85aec2653acf0ef13178278794e70fb102 \
     11                    sha256  69788efda7d434d1bc094bb414bd92c269dc7894326320634500b05d63c008e8 \
     12                    size    263875
    513
    6 name                qgit
    7 version             2.5.20140910
    814categories          devel
    915license             GPL-2
    1016maintainers         nomaintainer
    1117description         A Qt graphical interface to git repositories
    1218long_description    {*}${description}
    1319
    14 homepage            http://libre.tibirna.org/projects/qgit
    15 
    16 fetch.type          git
    17 git.url             git://repo.or.cz/qgit4/redivivus.git
    18 git.branch          c83cb5819443adf0e3b60d1ac3a63d9cbb22e124
    19 
    2020platforms           darwin
    2121
    2222depends_lib-append  port:git
    2323
    24 patchfiles          patch_src_qgit.cpp.diff
     24patchfiles          patch_src_qgit.cpp.diff \
     25                    patch_src_namespace_def.cpp.diff \
     26                    patch-build-app-bundle.diff
    2527
    2628variant debug description "Build as both release and debug" {}
    2729
    post-patch { 
    3537    # nothing to do if +debug is specified; this is the default.
    3638}
    3739
    38 # --disable-dependency-tracking is not recognized.
    39 configure.universal_args-delete --disable-dependency-tracking
    40 
    41 pre-configure {
    42     configure.args-append CONFIG+=\"${qt_arch_types}\"
    43 }
    44 
    45 configure.cmd       ${qt_qmake_cmd}
    46 configure.pre_args
    47 configure.post_args
     40cmake.out_of_source yes
    4841
    4942destroot {
    5043    xinstall -m 755 -d ${destroot}${qt_apps_dir}
    51     copy ${worksrcpath}/bin/qgit.app ${destroot}${qt_apps_dir}
     44    copy ${build.dir}/qgit.app ${destroot}${qt_apps_dir}
    5245
    5346    # Also link to ${prefix}/bin for easier access from the command line
    5447    # Especially useful since qgit is supposed to be started from
    destroot { 
    5649    ln -s ${qt_apps_dir}/qgit.app/Contents/MacOS/qgit ${destroot}${prefix}/bin
    5750}
    5851
    59 livecheck.type   none
     52github.tag_prefix ${name}-
  • devel/qgit/files/patch_src_namespace_def.cpp.diff

    diff --git a/devel/qgit/files/patch_src_namespace_def.cpp.diff b/devel/qgit/files/patch_src_namespace_def.cpp.diff
    index 34a1403c262..a0eef8f2c12 100644
    a b  
    1 diff -ru src/namespace_def.cpp.org src/namespace_def.cpp
    2 --- src/namespace_def.cpp.org   2008-03-21 03:19:30.000000000 +0100
    3 +++ src/namespace_def.cpp       2008-10-11 17:11:09.000000000 +0200
    4 @@ -51,6 +51,33 @@
     1--- src/namespace_def.cpp.orig  2019-08-24 15:15:06.000000000 -0400
     2+++ src/namespace_def.cpp       2020-06-24 10:37:03.000000000 -0400
     3@@ -77,6 +77,33 @@
    54        }
    65 }
    76 
  • devel/qgit/files/patch_src_qgit.cpp.diff

    diff --git a/devel/qgit/files/patch_src_qgit.cpp.diff b/devel/qgit/files/patch_src_qgit.cpp.diff
    index 125f5a4e1f9..6485d680acb 100644
    a b  
    1 diff -ru src/qgit.cpp.org src/qgit.cpp
    2 --- src/qgit.cpp.org    2007-12-31 07:12:57.000000000 +0100
    3 +++ src/qgit.cpp        2008-10-11 17:14:05.000000000 +0200
    4 @@ -16,11 +16,11 @@
    5         QCoreApplication::setOrganizationName(ORG_KEY);
     1--- src/qgit.cpp.orig   2019-08-24 15:15:06.000000000 -0400
     2+++ src/qgit.cpp        2020-06-19 15:53:13.000000000 -0400
     3@@ -24,11 +24,11 @@
     4     QCoreApplication::setOrganizationName(ORG_KEY);
    65        QCoreApplication::setApplicationName(APP_KEY);
    76 
    87-       /* On Windows msysgit exec directory is set up