[102745] users/cal/ports/gnome/gtk-vnc
cal at macports.org
cal at macports.org
Thu Feb 7 14:12:05 PST 2013
Revision: 102745
https://trac.macports.org/changeset/102745
Author: cal at macports.org
Date: 2013-02-07 14:12:05 -0800 (Thu, 07 Feb 2013)
Log Message:
-----------
gtk-vnc: update to 0.5.1, allow using other python versions
Modified Paths:
--------------
users/cal/ports/gnome/gtk-vnc/Portfile
users/cal/ports/gnome/gtk-vnc/files/patch-continuation-h.diff
users/cal/ports/gnome/gtk-vnc/files/patch-coroutine_ucontext-c.diff
Property Changed:
----------------
users/cal/ports/gnome/gtk-vnc/Portfile
Modified: users/cal/ports/gnome/gtk-vnc/Portfile
===================================================================
--- users/cal/ports/gnome/gtk-vnc/Portfile 2013-02-07 22:00:46 UTC (rev 102744)
+++ users/cal/ports/gnome/gtk-vnc/Portfile 2013-02-07 22:12:05 UTC (rev 102745)
@@ -4,7 +4,7 @@
PortSystem 1.0
name gtk-vnc
-version 0.4.3
+version 0.5.1
categories gnome
platforms darwin
maintainers cal openmaintainer
@@ -18,30 +18,62 @@
master_sites gnome
master_sites.mirror_subdir \
sources/${name}/[join [lrange [split ${version} .] 0 1] .]
-use_bzip2 yes
-checksums rmd160 f7cc379b43088b83628dc92fb10ece463b1ab8fc \
- sha256 b9870d923d636d2e7547267d01c8cafdc06ad5b5b4987003ea3cd567bfbb6377
+use_xz yes
+checksums rmd160 9b21f59911c4aeea70bd3171066956c65ad59b8e \
+ sha256 1ad1847a23f8ea8fbf2396de46c51ec0900ee3698cde4e205760518cd1e01a40
-patchfiles patch-coroutine_ucontext-c.diff \
- patch-continuation-h.diff \
+patchfiles patch-continuation-h.diff \
+ patch-coroutine_ucontext-c.diff \
patch-vncmodule-c.diff
-depends_build port:intltool
+depends_build port:intltool \
+ port:pkgconfig
+depends_lib port:gnutls
-depends_lib port:py27-gtk
+proc _setup_python_specifics {pyversion versionstring} {
+ global frameworks_dir
-configure.env-append PKG_CONFIG_PATH="${frameworks_dir}/Python.framework/Versions/2.7/lib/pkgconfig"
-build.env-append PKG_CONFIG_PATH="${frameworks_dir}/Python.framework/Versions/2.7/lib/pkgconfig"
-build.args-append NO_UNDEFINED_FLAGS=""
+ depends_lib-append port:py${pyversion}-pygtk
+ eval "post-configure { \
+ reinplace -E \"s#pygtk-codegen-2.0#pygtk-codegen-2.0-${versionstring}#g\" \"\${worksrcpath}/src/Makefile\" \
+ }"
+ configure.env-append PKG_CONFIG_PATH="${frameworks_dir}/Python.framework/Versions/${versionstring}/lib/pkgconfig"
+ build.env-append PKG_CONFIG_PATH="${frameworks_dir}/Python.framework/Versions/${versionstring}/lib/pkgconfig"
+ eval "post-destroot { \
+ file mkdir \"\${destroot}\${frameworks_dir}/Python.framework/Versions/${versionstring}/lib\" \n
+ file rename \"\${destroot}\${prefix}/lib/python${versionstring}/site-packages\" \"\${destroot}\${frameworks_dir}/Python.framework/Versions/${versionstring}/lib/python${versionstring}\" \
+ }"
+}
-post-configure {
- reinplace -E "s#pygtk-codegen-2.0#${frameworks_dir}/Python.framework/Versions/2.7/bin/pygobject-codegen-2.0#g" "${worksrcpath}/src/Makefile"
+variant python27 description {Build against Python 2.7} conflicts python32 python33 {
+ _setup_python_specifics 27 "2.7"
}
+variant python32 description {Build against Python 3.2} conflicts python27 python33 {
+ _setup_python_specifics 32 "3.2"
+}
+variant python33 description {Build against Python 3.3} conflicts python27 python32 {
+ _setup_python_specifics 33 "3.3"
+}
+if {![variant_isset python32] && ![variant_isset python33]} {
+ default_variants +python27
+}
+if {![variant_isset python32] && ![variant_isset python33] && ![variant_isset python27]} {
+ pre-fetch {
+ error "You must choose one of the python variants"
+ }
+}
+
# required to use some deprecated symbols the compiler would #error out of
configure.cflags-append -D_XOPEN_SOURCE
-
-post-destroot {
- file mkdir "${destroot}${frameworks_dir}/Python.framework/Versions/2.7/lib"
- file rename "${destroot}${prefix}/lib/python2.7/site-packages" "${destroot}${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7"
-}
-
+configure.args --enable-plugin=no \
+ --disable-introspection \
+ --disable-vala \
+ --with-gtk=2.0 \
+ --with-python \
+ --without-examples \
+ --with-libview \
+ --without-pulseaudio \
+ --without-sasl \
+ --with-coroutine=gthread
+configure.env-append CPPFLAGS=-Werror=unknown-warning-option
+build.args-append NO_UNDEFINED_FLAGS=""
Property changes on: users/cal/ports/gnome/gtk-vnc/Portfile
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: users/cal/ports/gnome/gtk-vnc/files/patch-continuation-h.diff
===================================================================
--- users/cal/ports/gnome/gtk-vnc/files/patch-continuation-h.diff 2013-02-07 22:00:46 UTC (rev 102744)
+++ users/cal/ports/gnome/gtk-vnc/files/patch-continuation-h.diff 2013-02-07 22:12:05 UTC (rev 102745)
@@ -1,10 +1,10 @@
---- src/continuation.h.orig 2011-11-04 04:31:32.000000000 +0100
-+++ src/continuation.h 2011-11-04 04:31:43.000000000 +0100
+--- src/continuation.h.orig 2013-02-07 22:23:14.000000000 +0100
++++ src/continuation.h 2013-02-07 22:24:02.000000000 +0100
@@ -22,6 +22,7 @@
#define _CONTINUATION_H_
#include <ucontext.h>
-+#include <stddef.h>
++#include <stdlib.h>
struct continuation
{
Modified: users/cal/ports/gnome/gtk-vnc/files/patch-coroutine_ucontext-c.diff
===================================================================
--- users/cal/ports/gnome/gtk-vnc/files/patch-coroutine_ucontext-c.diff 2013-02-07 22:00:46 UTC (rev 102744)
+++ users/cal/ports/gnome/gtk-vnc/files/patch-coroutine_ucontext-c.diff 2013-02-07 22:12:05 UTC (rev 102745)
@@ -1,11 +1,11 @@
---- src/coroutine_ucontext.c.orig 2011-11-04 04:33:29.000000000 +0100
-+++ src/coroutine_ucontext.c 2011-11-04 04:35:58.000000000 +0100
+--- src/coroutine_ucontext.c.orig 2013-02-07 22:27:03.000000000 +0100
++++ src/coroutine_ucontext.c 2013-02-07 22:27:14.000000000 +0100
@@ -60,7 +60,7 @@
- co->cc.stack_size = co->stack_size;
- co->cc.stack = mmap(0, co->stack_size,
- PROT_READ | PROT_WRITE,
-- MAP_PRIVATE | MAP_ANONYMOUS,
-+ MAP_PRIVATE | MAP_ANON,
- -1, 0);
- if (co->cc.stack == MAP_FAILED)
- return -1;
+ co->cc.stack_size = co->stack_size;
+ co->cc.stack = mmap(0, co->stack_size,
+ PROT_READ | PROT_WRITE,
+- MAP_PRIVATE | MAP_ANONYMOUS,
++ MAP_PRIVATE | MAP_ANON,
+ -1, 0);
+ if (co->cc.stack == MAP_FAILED)
+ return -1;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130207/9abe2e22/attachment.html>
More information about the macports-changes
mailing list