[102041] trunk/dports/devel/gtk-osx-application
elelay at macports.org
elelay at macports.org
Sat Jan 26 00:27:23 PST 2013
Revision: 102041
https://trac.macports.org/changeset/102041
Author: elelay at macports.org
Date: 2013-01-26 00:27:23 -0800 (Sat, 26 Jan 2013)
Log Message:
-----------
apply #37700 update gtk-osx-application to 2.0.1
Modified Paths:
--------------
trunk/dports/devel/gtk-osx-application/Portfile
trunk/dports/devel/gtk-osx-application/files/patch-bindings-python-gtk_osxapplication-Makefile-in.diff
trunk/dports/devel/gtk-osx-application/files/patch-bindings-python-gtkmacintegration-Makefile-in.diff
Added Paths:
-----------
trunk/dports/devel/gtk-osx-application/files/patch-cocoa-menu-item-c.diff
Removed Paths:
-------------
trunk/dports/devel/gtk-osx-application/files/patch-gtkosxapplication.h.diff
Modified: trunk/dports/devel/gtk-osx-application/Portfile
===================================================================
--- trunk/dports/devel/gtk-osx-application/Portfile 2013-01-25 21:51:49 UTC (rev 102040)
+++ trunk/dports/devel/gtk-osx-application/Portfile 2013-01-26 08:27:23 UTC (rev 102041)
@@ -4,8 +4,7 @@
PortSystem 1.0
name gtk-osx-application
-version 1.0.1
-revision 2
+version 2.0.1
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers elelay openmaintainer
@@ -24,12 +23,12 @@
platforms darwin
master_sites gnome:sources/gtk-mac-integration/${branch}/
-distname gtk-mac-integration-${version}
-use_bzip2 yes
+distname gtk-mac-integration-${version}
+use_xz yes
-checksums md5 9706d7f55ed82b3d838c48968060b54d \
- sha1 57d7adad87c596242f8413ec40191a5b93aad0f6 \
- rmd160 3ffc7919d56eb284ca30e2416870614b9b9f3561
+checksums md5 45a4d217d0a7d6f3d4f974f99ec50c29 \
+ sha1 9d939a2e4fb6c0ab4fe3d544ac712a152451249a \
+ rmd160 67b4c9bff4aaab9efcbc4042b452e8a79c038828
depends_build port:pkgconfig
@@ -50,24 +49,24 @@
variant python25 conflicts python26 description {Use Python 2.5} {
depends_lib-append port:py25-pygtk
- set python_prefix ${frameworks_dir}/Python.framework/Versions/2.5
+ set python_prefix ${frameworks_dir}/Python.framework/Versions/2.5
- configure.python ${python_prefix}/bin/python2.5
- 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.python ${python_prefix}/bin/python2.5
+ 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}
+ configure.pre_args --prefix=${python_prefix}
}
variant python26 conflicts python25 description {Use Python 2.6} {
depends_lib-append port:py26-pygtk
- set python_prefix ${frameworks_dir}/Python.framework/Versions/2.6
+ set python_prefix ${frameworks_dir}/Python.framework/Versions/2.6
- 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.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}
+ configure.pre_args --prefix=${python_prefix}
}
variant python27 conflicts python26 conflicts python25 description {Use Python 2.7} {
@@ -85,10 +84,9 @@
default_variants +python27
}
-
-configure.ccache no
+configure.ccache no
configure.cmd-append --libdir=${prefix}/lib --includedir=${prefix}/include
-patchfiles-append patch-bindings-python-gtk_osxapplication-Makefile-in.diff \
- patch-bindings-python-gtkmacintegration-Makefile-in.diff \
- patch-gtkosxapplication.h.diff
+patchfiles-append patch-bindings-python-gtkmacintegration-Makefile-in.diff \
+ patch-bindings-python-gtk_osxapplication-Makefile-in.diff \
+ patch-cocoa-menu-item-c.diff
Modified: trunk/dports/devel/gtk-osx-application/files/patch-bindings-python-gtk_osxapplication-Makefile-in.diff
===================================================================
--- trunk/dports/devel/gtk-osx-application/files/patch-bindings-python-gtk_osxapplication-Makefile-in.diff 2013-01-25 21:51:49 UTC (rev 102040)
+++ trunk/dports/devel/gtk-osx-application/files/patch-bindings-python-gtk_osxapplication-Makefile-in.diff 2013-01-26 08:27:23 UTC (rev 102041)
@@ -1,11 +1,11 @@
---- bindings/python/gtk_osxapplication/Makefile.in.old 2010-07-19 19:32:49.000000000 +0200
-+++ bindings/python/gtk_osxapplication/Makefile.in 2010-07-19 19:33:32.000000000 +0200
-@@ -232,7 +232,7 @@
+--- bindings/python/gtkosx_application/Makefile.in.old 2013-01-25 08:40:08.000000000 +0100
++++ bindings/python/gtkosx_application/Makefile.in 2013-01-25 08:41:39.000000000 +0100
+@@ -252,7 +252,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
INCLUDES = -I$(top_srcdir)/src $(PYTHON_INCLUDES)
--gtk_osxapplicationdir = $(libdir)/python$(PYTHON_VERSION)/site-packages/gtk_osxapplication
-+gtk_osxapplicationdir = @pythondir@/gtk_osxapplication
- gtk_osxapplication_PYTHON = __init__.py
- gtk_osxapplication_LTLIBRARIES = _gtk_osxapplication.la
+-gtkosx_applicationdir = $(libdir)/python$(PYTHON_VERSION)/site-packages/gtkosx_application
++gtkosx_applicationdir = @pythondir@/gtkosx_application
+ gtkosx_application_PYTHON = __init__.py
+ gtkosx_application_LTLIBRARIES = _gtkosx_application.la
headers = $(top_srcdir)/src/gtkosxapplication.h
Modified: trunk/dports/devel/gtk-osx-application/files/patch-bindings-python-gtkmacintegration-Makefile-in.diff
===================================================================
--- trunk/dports/devel/gtk-osx-application/files/patch-bindings-python-gtkmacintegration-Makefile-in.diff 2013-01-25 21:51:49 UTC (rev 102040)
+++ trunk/dports/devel/gtk-osx-application/files/patch-bindings-python-gtkmacintegration-Makefile-in.diff 2013-01-26 08:27:23 UTC (rev 102041)
@@ -1,6 +1,6 @@
---- bindings/python/gtkmacintegration/Makefile.in.old 2010-07-19 19:42:18.000000000 +0200
-+++ bindings/python/gtkmacintegration/Makefile.in 2010-07-19 19:43:04.000000000 +0200
-@@ -232,7 +232,7 @@
+--- 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
+@@ -252,7 +252,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
INCLUDES = -I$(top_srcdir)/src $(PYTHON_INCLUDES)
Added: trunk/dports/devel/gtk-osx-application/files/patch-cocoa-menu-item-c.diff
===================================================================
--- trunk/dports/devel/gtk-osx-application/files/patch-cocoa-menu-item-c.diff (rev 0)
+++ trunk/dports/devel/gtk-osx-application/files/patch-cocoa-menu-item-c.diff 2013-01-26 08:27:23 UTC (rev 102041)
@@ -0,0 +1,11 @@
+--- src/cocoa_menu_item.c.old 2013-01-19 17:50:18.000000000 +0100
++++ src/cocoa_menu_item.c 2013-01-19 17:50:49.000000000 +0100
+@@ -524,7 +524,7 @@
+ DEBUG ("\ta separator\n");
+ } else {
+ const gchar* text = get_menu_label_text (menu_item, &label);
+- NSString *title = [NSString stringWithUTF8String:(text ? text : @"")];
++ NSString *title = [NSString stringWithUTF8String:(text ? text : "")];
+
+ GClosure *menu_action =
+ g_cclosure_new_object_swap(G_CALLBACK(gtk_menu_item_activate),
Deleted: trunk/dports/devel/gtk-osx-application/files/patch-gtkosxapplication.h.diff
===================================================================
--- trunk/dports/devel/gtk-osx-application/files/patch-gtkosxapplication.h.diff 2013-01-25 21:51:49 UTC (rev 102040)
+++ trunk/dports/devel/gtk-osx-application/files/patch-gtkosxapplication.h.diff 2013-01-26 08:27:23 UTC (rev 102041)
@@ -1,9 +0,0 @@
---- src/gtkosxapplication.h.orig 2011-11-06 01:15:07.000000000 -0400
-+++ src/gtkosxapplication.h 2011-11-06 01:15:07.000000000 -0400
-@@ -143,5 +143,6 @@
- gchar *quartz_application_get_bundle_id(void);
- gchar *quartz_application_get_bundle_info(const gchar *key);
-
-+G_END_DECLS
-
- #endif /* __GTK_OSX_APPLICATION_H__ */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130126/c411a2dd/attachment-0001.html>
More information about the macports-changes
mailing list