<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[138229] trunk/dports/devel/gtk-osx-application</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/138229">138229</a></dd>
<dt>Author</dt> <dd>elelay@macports.org</dd>
<dt>Date</dt> <dd>2015-07-02 11:59:53 -0700 (Thu, 02 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>gtk-osx-application: replaced by {py27-,}gtk-osx-application-{common-,}gtk{2,3}</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelgtkosxapplicationPortfile">trunk/dports/devel/gtk-osx-application/Portfile</a></li>
<li><a href="#trunkdportsdevelgtkosxapplicationfilespatchbindingspythongtkmacintegrationMakefileindiff">trunk/dports/devel/gtk-osx-application/files/patch-bindings-python-gtkmacintegration-Makefile-in.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelgtkosxapplicationPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/gtk-osx-application/Portfile (138228 => 138229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/gtk-osx-application/Portfile 2015-07-02 17:42:40 UTC (rev 138228)
+++ trunk/dports/devel/gtk-osx-application/Portfile 2015-07-02 18:59:53 UTC (rev 138229)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx">
</span><span class="cx"> name gtk-osx-application
</span><span class="cx"> conflicts ige-mac-integration
</span><del>-version 2.0.7
</del><ins>+version 2.0.8
</ins><span class="cx"> license LGPL-2.1
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories devel
</span><span class="lines">@@ -16,9 +16,9 @@
</span><span class="cx">
</span><span class="cx"> long_description \
</span><span class="cx"> A simple library whose purpose is to \
</span><del>- allow GTK2 quartz applications to integrate with \
- the Mac OS X menu bar. Requires gtk2 and its \
- dependencies to be built with variants +no_x11 +quartz
</del><ins>+ allow GTK quartz applications to integrate with \
+ the Mac OS X menu bar. Requires gtk2 or gtk3 and its \
+ dependencies to be built with variant +quartz
</ins><span class="cx">
</span><span class="cx"> homepage https://wiki.gnome.org/Projects/GTK%2B/OSX/Integration
</span><span class="cx">
</span><span class="lines">@@ -30,110 +30,140 @@
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><span class="cx"> # sha256 from upstream, rmd160 computed locally
</span><del>-checksums sha256 e6de70da740b452f18c113a7ebb6772936a0fb9873137514090849820e296eb7 \
- rmd160 495f68d23e45306ddc6e5a05ed665f5af187c062
</del><ins>+checksums sha256 74fce9dbc5efe4e3d07a20b24796be1b1d6c3ac10a0ee6b1f1d685c809071b79 \
+ rmd160 53fd44172a3fa076e4401b6aac1adb10b76a5b7c
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><ins>+set gtk_version gtk2
+
</ins><span class="cx"> pre-configure {
</span><span class="cx">
</span><del>- if {![active_variants $gtk_version quartz x11]} {
</del><ins>+ if {${name} eq ${subport}} {
</ins><span class="cx"> ui_error "
</span><ins>+The gtk-osx-application port has been replaced by 'gtk-osx-application-gtk2'
+and 'gtk-osx-application-gtk3'.
+Please `sudo port deactivate gtk-osx-application`
+followed by `sudo port upgrade -u outdated` or another command to update.
+Then if all works as intended `sudo port uninstall gtk-osx-application`
+"
+ return -code error
+ }
</ins><span class="cx">
</span><del>-****
-**** gtk-osx-application is meant to be used only in a GTK quartz
-**** development environment but your version of GTK does not
-**** support quartz. Please make sure that port $gtk_version and all its
-**** dependencies are built with variants +no_x11 +quartz and try again.
-****
</del><ins>+ if {![active_variants $gtk_version quartz ""]} {
+ ui_error "
+${subport} is meant to be used only in a GTK quartz
+development environment but your version of GTK does not
+support quartz. Please make sure that port $gtk_version and all its
+dependencies are built with variants +quartz and try again.
</ins><span class="cx"> "
</span><del>- error "$gtk_version +no_x11 +quartz not installed."
</del><ins>+ error "$gtk_version +quartz not installed."
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant python26 conflicts python27 description {Use Python 2.6} {
</del><ins>+# py27-gtk-osx-application-gtk3 is not needed (only gir matters).
+# If a python gtk3 program requires gtk-osx-application, add
+# depends_lib-append port:gtk-osx-application-gtk3 \
+# port:py27-gobject3
</ins><span class="cx">
</span><del>- if {[variant_isset gtk3]} {
</del><ins>+subport py27-gtk-osx-application-gtk2 {
+ set gtk_version gtk2
</ins><span class="cx">
</span><del>- depends_lib-append port:py26-gobject3
</del><ins>+ depends_lib-append port:py27-pygtk \
+ port:gtk-osx-application-gtk2
+
+ set python_prefix ${frameworks_dir}/Python.framework/Versions/2.7
</ins><span class="cx">
</span><del>- # don't bother configuring python because it's not needed (only gir matters)
</del><ins>+ configure.python ${python_prefix}/bin/python2.7
+ configure.env-append PYGTK_CODEGEN=${python_prefix}/bin/pygtk-codegen-2.0
+ configure.env-append PYGOBJECT_CODEGEN=${python_prefix}/bin/pygobject-codegen-2.0
+ configure.pkg_config_path ${python_prefix}/lib/pkgconfig/
+ configure.pre_args --prefix=${python_prefix}
</ins><span class="cx">
</span><del>- } else {
</del><span class="cx">
</span><del>- depends_lib-append port:py26-pygtk
- set python_prefix ${frameworks_dir}/Python.framework/Versions/2.6
</del><ins>+ configure.args-append --with-gtk2 --without-gtk3 --disable-introspection
</ins><span class="cx">
</span><del>- configure.python ${python_prefix}/bin/python2.6
- configure.env-append PYGTK_CODEGEN=${python_prefix}/bin/pygtk-codegen-2.0
- configure.env-append PYGOBJECT_CODEGEN=${python_prefix}/bin/pygobject-codegen-2.0
- configure.pkg_config_path ${python_prefix}/lib/pkgconfig/
- configure.pre_args --prefix=${python_prefix}
-
</del><ins>+ # enable-python defaults to all, but it must be set to
+ # 'yes' otherwise pygtk bindings are not built.
+ # By the way, I had no success configuring with --python=all
+ # as per README (configure rejected the option).
+ # So no gir for gtk2 variant
+ configure.args-append --enable-python=yes
+
+ post-destroot {
+ delete ${destroot}${prefix}/include
+ delete ${destroot}${prefix}/lib
+ delete ${destroot}${prefix}/share
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><del>-variant python27 conflicts python26 description {Use Python 2.7} {
</del><ins>+subport gtk-osx-application-gtk3 {
+ set gtk_version gtk3
+
+ depends_lib-append port:gtk3 \
+ path:include/gtkmacintegration/gtk-mac-bundle.h:gtk-osx-application-common-gtk3
</ins><span class="cx">
</span><del>- if {[variant_isset gtk3]} {
</del><ins>+
+ # force gtk version
+ configure.args-append --with-gtk3 --without-gtk2
</ins><span class="cx">
</span><del>- depends_lib-append port:py27-gobject3
</del><ins>+ configure.args-append --enable-python=no
</ins><span class="cx">
</span><del>- # don't bother configuring python because it's not needed (only gir matters)
</del><ins>+ post-destroot {
+ delete ${destroot}${prefix}/include
+ delete ${destroot}${prefix}/lib/pkgconfig/gtk-mac-integration.pc
+ delete ${destroot}${prefix}/share/strings
+ }
+}
</ins><span class="cx">
</span><del>- } else {
</del><ins>+subport gtk-osx-application-common-gtk3 {
+ set gtk_version gtk3
+
+ depends_lib-append port:gtk3
</ins><span class="cx">
</span><del>- depends_lib-append port:py27-pygtk
-
- set python_prefix ${frameworks_dir}/Python.framework/Versions/2.7
</del><ins>+
+ # force gtk version
+ configure.args-append --with-gtk3 --without-gtk2
</ins><span class="cx">
</span><del>- configure.python ${python_prefix}/bin/python2.7
- configure.env-append PYGTK_CODEGEN=${python_prefix}/bin/pygtk-codegen-2.0
- configure.env-append PYGOBJECT_CODEGEN=${python_prefix}/bin/pygobject-codegen-2.0
- configure.pkg_config_path ${python_prefix}/lib/pkgconfig/
- configure.pre_args --prefix=${python_prefix}
</del><ins>+ configure.args-append --enable-python=no
</ins><span class="cx">
</span><ins>+ post-destroot {
+ delete ${destroot}${prefix}/lib
+ delete ${destroot}${prefix}/share/gir-1.0
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><del>-variant no_python conflicts python26 conflicts python27 description {
- Don't build python bindings, don't require any python} {
-}
</del><ins>+subport gtk-osx-application-gtk2 {
+ set gtk_version gtk2
</ins><span class="cx">
</span><del>-if {![variant_isset python26] && ![variant_isset python27] && ![variant_isset no_python]} {
- default_variants +python27
-}
</del><ins>+ depends_lib-append port:gtk2 \
+ path:include/gtkmacintegration/gtk-mac-bundle.h:gtk-osx-application-common-gtk2
</ins><span class="cx">
</span><ins>+ # force gtk version to 2.0
+ configure.args-append --with-gtk2 --without-gtk3 --disable-introspection
</ins><span class="cx">
</span><del>-variant gtk3 description {Use gtk3} {
-
- depends_lib-append port:gtk3
-
- # force gtk version
- configure.args-append --with-gtk=gtk+-3.0
</del><ins>+ configure.args-append --enable-python=no
</ins><span class="cx">
</span><del>- # to put strings folder in /opt/local/share, not in python Framework share
- configure.args-append --datadir=${prefix}/share
-
</del><ins>+ post-destroot {
+ delete ${destroot}${prefix}/include
+ delete ${destroot}${prefix}/lib/pkgconfig/gtk-mac-integration.pc
+ delete ${destroot}${prefix}/share/strings
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-if {[variant_isset gtk3]} {
- set gtk_version gtk3
-} else {
</del><ins>+subport gtk-osx-application-common-gtk2 {
</ins><span class="cx"> set gtk_version gtk2
</span><span class="cx">
</span><ins>+ depends_lib-append port:gtk2
+
</ins><span class="cx"> # force gtk version to 2.0
</span><del>- configure.args-append --with-gtk=gtk+-2.0
- # enable-python defaults to all, but it must be set to
- # 'yes' otherwise pygtk bindings are not built.
- # By the way, I had no success configuring with --python=all
- # as per README (configure rejected the option).
- # So no gir for gtk2 variant
- if {[variant_isset python26] || [variant_isset python27]} {
- configure.args-append --enable-python=yes
</del><ins>+ configure.args-append --with-gtk2 --without-gtk3 --disable-introspection
+
+ configure.args-append --enable-python=no
+
+ post-destroot {
+ delete ${destroot}${prefix}/lib
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsdevelgtkosxapplicationfilespatchbindingspythongtkmacintegrationMakefileindiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/gtk-osx-application/files/patch-bindings-python-gtkmacintegration-Makefile-in.diff (138228 => 138229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/gtk-osx-application/files/patch-bindings-python-gtkmacintegration-Makefile-in.diff 2015-07-02 17:42:40 UTC (rev 138228)
+++ trunk/dports/devel/gtk-osx-application/files/patch-bindings-python-gtkmacintegration-Makefile-in.diff 2015-07-02 18:59:53 UTC (rev 138229)
</span><span class="lines">@@ -1,12 +1,11 @@
</span><del>---- bindings/python/gtkmacintegration/Makefile.in.old 2013-01-19 17:30:25.000000000 +0100
-+++ bindings/python/gtkmacintegration/Makefile.in 2013-01-19 17:31:37.000000000 +0100
-@@ -344,7 +344,7 @@
- top_build_prefix = @top_build_prefix@
</del><ins>+--- bindings/python/gtkmacintegration/Makefile.in.orig 2015-06-22 19:51:48.000000000 +0200
++++ bindings/python/gtkmacintegration/Makefile.in 2015-06-22 19:48:03.000000000 +0200
+@@ -399,7 +399,7 @@
</ins><span class="cx"> top_builddir = @top_builddir@
</span><span class="cx"> top_srcdir = @top_srcdir@
</span><span class="cx"> AM_CPPFLAGS = -I$(top_srcdir)/src $(PYTHON_INCLUDES)
</span><span class="cx"> -gtkmacintegrationdir = $(libdir)/python$(PYTHON_VERSION)/site-packages/gtkmacintegration
</span><span class="cx"> +gtkmacintegrationdir = @pythondir@/gtkmacintegration
</span><span class="cx"> gtkmacintegration_PYTHON = __init__.py
</span><del>- gtkmacintegration_LTLIBRARIES = _gtkmacintegration.la
</del><ins>+ gtkmacintegration_LTLIBRARIES = $(am__append_1) $(am__append_2)
</ins><span class="cx"> headers = \
</span></span></pre>
</div>
</div>
</body>
</html>