Changeset 138249


Ignore:
Timestamp:
Jul 2, 2015, 11:35:25 PM (4 years ago)
Author:
devans@…
Message:

gimp2-devel: update to git master as of 20150630, build +quartz using gtk-osx-application-gtk2, now supports lcms2, remove outdated +gvfs variant, disable +help_browser when building +quartz due to build problems with webkit-gtk +quartz (#47936).

Location:
trunk/dports/graphics/gimp2-devel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/graphics/gimp2-devel/Portfile

    r136285 r138249  
    88conflicts           gimp2 gimp3-devel
    99set git_name        gimp
    10 set git_commit      1d5bffd1c288425214c01025807ecda8e0227c69
    11 set git_date        20150223
     10set git_commit      f72f8f20e57ba8abeac3a656b07314a34673776c
     11set git_date        20150630
    1212version             2.9.1-${git_date}
    13 revision            1
    1413license             GPL-3+
    1514categories          graphics
     
    1918description         The GNU Image Manipulation Program
    2019long_description    The GNU Image Manipulation Program (GIMP) is a powerful \
    21                         tool for the preparation and manipulation of digital images. \
    22                         The GIMP provides the user with a wide variety of image \
    23                         manipulation, painting, processing, and rendering tools. \
     20                    tool for the preparation and manipulation of digital images. \
     21                    The GIMP provides the user with a wide variety of image \
     22                    manipulation, painting, processing, and rendering tools. \
    2423                    This is the development version leading to a future 2.10 release \
    2524                    branch based on a recent snapshot of upstream git master.
     
    3029distname            ${git_name}-${git_commit}
    3130
    32 checksums           rmd160  450f9577947b8c5392a3eb5ac9beee707cd1fcb6 \
    33                     sha256  d6197cf9410d06d7d1248837cfd2bf395edc723bef86a73973fe93bfb75e861d
     31checksums           rmd160  013a0e9e5bebf8e142fe69c509ecde143dc30062 \
     32                    sha256  204b7acc03b332cf1f9d1fd6776242bd7200367ae3d0cb39bdf7e0c0ffc8b59e
    3433
    3534depends_build       port:pkgconfig \
     35                    port:intltool \
     36                    port:gtk-doc \
    3637                    port:autoconf \
    3738                    port:automake \
    38                     port:libtool \
    39                     port:intltool \
    40                     port:gtk-doc
     39                    port:libtool
    4140
    4241depends_lib         port:desktop-file-utils \
     
    6362                    port:libwmf \
    6463                    port:jasper \
    65                     port:lcms \
     64                    port:lcms2 \
    6665                    port:dbus-glib \
    6766                    port:libxml2 \
     
    7271                    port:xorg-libXfixes
    7372
    74 depends_run         path:share/gimp/2.0/help:gimp-help-en
    75 
    76 use_parallel_build  no
     73# gcc-4.2 5493 and 5666.3_13: gimpcpuaccel.c:180: error: can't find a register in class 'BREG' while reloading 'asm'
     74compiler.blacklist-append gcc-3.3 gcc-4.0 gcc-4.2 apple-gcc-4.2
    7775
    7876patchfiles          patch-etc-gimprc.diff
    79 
    80 # gcc-4.2 5493 and 5666.3_13: gimpcpuaccel.c:180: error: can't find a register in class 'BREG' while reloading 'asm'
    81 compiler.blacklist-append gcc-3.3 gcc-4.0 gcc-4.2 apple-gcc-4.2
    8277
    8378pre-configure {
     
    106101                    --disable-python \
    107102                    --without-alsa \
    108                     --without-gvfs \
    109103                    --without-gudev \
    110                     --without-webkit \
    111                     --without-mac-twain
     104                    --without-webkit
    112105
    113106# --without-mac-twain:
    114107#     Leopard's 64bit Carbon is missing QuitApplicationEventLoop
    115 #     It doesn't build any more anyways:
     108#     It doesn't build any more anyway:
    116109#         https://trac.macports.org/ticket/35168
     110
     111configure.args-append \
     112                    --without-mac-twain
    117113
    118114variant python27 description {Build with python plugin support using python 2.7} {
     
    125121}
    126122
    127 variant gvfs description {Enable GIO/gvfs support} {
    128     depends_lib-append      port:gvfs
    129     configure.args-delete   --without-gvfs
    130 }
    131123
    132124variant remote description {Enable building of obsolete gimp-remote helper app} {
     
    138130}
    139131
    140 variant quartz {
     132variant quartz conflicts help_browser {
    141133    depends_lib-delete    port:xorg-libXcursor \
    142134                          port:xorg-libXmu \
     
    144136                          port:xorg-libXfixes \
    145137                          port:xpm
    146     depends_lib-append    port:gtk-osx-application
     138    depends_lib-append    port:gtk-osx-application-gtk2
    147139    configure.args-delete --with-x \
    148140                          --x-includes=${prefix}/include \
     
    150142    configure.args-append --without-x
    151143    configure.ldflags-append   -framework Carbon
    152 
    153 #
    154 # if variant is +quartz lcms plugin uses 32 bit only Carbon API
    155 #
    156 
    157     if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
    158         configure.args-append --without-lcms
    159     }
    160144}
    161145
    162 variant help_browser description {Enable Gimp help browser} {
     146variant help_browser conflicts quartz description {Enable Gimp help browser} {
     147    depends_run             path:share/gimp/2.0/help:gimp-help-en
    163148    configure.args-delete   --without-webkit
    164149
     
    174159#
    175160
    176 default_variants    +help_browser +gvfs
     161# help browser uses webkit-gtk which currently doesn't build +quartz (#47936)
    177162
    178 default_variants    +python27
     163if {[variant_isset quartz]} {
     164    default_variants    -help_browser +python27
     165} else {
     166    default_variants    +help_browser +python27
     167}
    179168
    180169# create unversioned symbolic link to versioned executable for compatibility with gimp-app
  • trunk/dports/graphics/gimp2-devel/files/patch-etc-gimprc.diff

    r133279 r138249  
    1 --- etc/gimprc.orig     2015-02-23 15:12:33.000000000 -0800
    2 +++ etc/gimprc  2015-02-23 18:09:38.000000000 -0800
    3 @@ -705,6 +705,8 @@
     1--- etc/gimprc.orig     2015-06-30 10:42:07.000000000 -0700
     2+++ etc/gimprc  2015-07-01 06:15:27.000000000 -0700
     3@@ -718,6 +718,8 @@
    44 #
    55 # (dock-window-hint utility)
Note: See TracChangeset for help on using the changeset viewer.