[110539] users/mojca/wxports/graphics
mojca at macports.org
mojca at macports.org
Sun Sep 1 14:00:51 PDT 2013
Revision: 110539
https://trac.macports.org/changeset/110539
Author: mojca at macports.org
Date: 2013-09-01 14:00:51 -0700 (Sun, 01 Sep 2013)
Log Message:
-----------
mojca/wxWidgets: merge changes from trunk
Modified Paths:
--------------
users/mojca/wxports/graphics/hugin-app/Portfile
users/mojca/wxports/graphics/wxWidgets-2.8/Portfile
users/mojca/wxports/graphics/wxWidgets-3.0/Portfile
Added Paths:
-----------
users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-include-wx-math.h.diff
users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-src-osx-cocoa-window.mm.diff
Removed Paths:
-------------
users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-src-osx-cocoa-window.mm.diff
Property Changed:
----------------
users/mojca/wxports/graphics/hugin-app/
users/mojca/wxports/graphics/hugin-app/files/patch-src-foreign-vigra-vigra-cachedfileimage.hxx.patch
users/mojca/wxports/graphics/hugin-app/files/patch-src-foreign-zthread-include-zthread-Guard.h.diff
users/mojca/wxports/graphics/hugin-app/files/patch-src-hugin1-base_wx-platform.h.diff
users/mojca/wxports/graphics/hugin-app/files/patch-src-hugin1-hugin1.pch.diff
users/mojca/wxports/graphics/wxWidgets-2.8/
users/mojca/wxports/graphics/wxWidgets-3.0/
Property changes on: users/mojca/wxports/graphics/hugin-app
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/dports/graphics/hugin-app:109583-110534
Modified: users/mojca/wxports/graphics/hugin-app/Portfile
===================================================================
--- users/mojca/wxports/graphics/hugin-app/Portfile 2013-09-01 20:59:49 UTC (rev 110538)
+++ users/mojca/wxports/graphics/hugin-app/Portfile 2013-09-01 21:00:51 UTC (rev 110539)
@@ -10,8 +10,7 @@
name hugin-app
version 2012.0.0
categories graphics
-maintainers gmail.com:hvdwolf \
- auckland.ac.nz:p.schmiedeskamp
+maintainers nomaintainer
description Panorama photo stitcher
long_description An easy to use cross-platform panoramic imaging \
toolchain based on Panorama Tools. With hugin you \
@@ -51,15 +50,15 @@
# Python version >=2.6
# SWIG >=2.0 - If Python >=3.2, SWIG must be >=2.0.4
#
-# NOTE: maybe the problem was that I already had swig installed,
-# but after it has been detected, it required swig-python
-# and additional python definitions, else it failed to bulid
+# NOTE: maybe the problem was that if swig is installed,
+# it gets detected and then requires swig-python
+# and additional python definitions, else it fails to bulid
# TODO: try to see where MAC_SELF_CONTAINED_BUNDLE gets defined
# patch-src-foreign-vigra-vigra-cachedfileimage.hxx.patch - https://bugs.launchpad.net/bugs/1213586
# patch-src-foreign-zthread-include-zthread-Guard.h.diff - https://bugs.launchpad.net/bugs/1213585
-# patch-src-hugin1-hugin1.pch.diff - doesn't really help (at least not for clang)
+# patch-src-hugin1-hugin1.pch.diff - moderately helps with compiler issues
# patch-src-hugin1-base_wx-platform.h.diff - fixed upstream
patchfiles patch-src-foreign-vigra-vigra-cachedfileimage.hxx.patch \
patch-src-foreign-zthread-include-zthread-Guard.h.diff \
Property changes on: users/mojca/wxports/graphics/hugin-app/files/patch-src-foreign-vigra-vigra-cachedfileimage.hxx.patch
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: users/mojca/wxports/graphics/hugin-app/files/patch-src-foreign-zthread-include-zthread-Guard.h.diff
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: users/mojca/wxports/graphics/hugin-app/files/patch-src-hugin1-base_wx-platform.h.diff
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: users/mojca/wxports/graphics/hugin-app/files/patch-src-hugin1-hugin1.pch.diff
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: users/mojca/wxports/graphics/wxWidgets-2.8
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/dports/graphics/wxWidgets:108471-110213
/trunk/dports/graphics/wxWidgets-2.8:110234-110532
Modified: users/mojca/wxports/graphics/wxWidgets-2.8/Portfile
===================================================================
--- users/mojca/wxports/graphics/wxWidgets-2.8/Portfile 2013-09-01 20:59:49 UTC (rev 110538)
+++ users/mojca/wxports/graphics/wxWidgets-2.8/Portfile 2013-09-01 21:00:51 UTC (rev 110539)
@@ -119,14 +119,15 @@
# wxgtk-2.8 (it doesn't work with Quartz)
if {$subport != $name} {
- depends_lib-append port:cairo \
+ depends_build-append path:bin/pkg-config:pkgconfig
+ depends_lib-append path:lib/pkgconfig/cairo.pc:cairo \
port:gtk2 \
port:mesa \
path:lib/pkgconfig/sdl.pc:libsdl \
port:libsdl_mixer
- require_active_variants cairo x11
- require_active_variants gtk2 x11
+ require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11
+ require_active_variants gtk2 x11
configure.args-delete --with-mac \
--without-sdl
@@ -138,6 +139,8 @@
foreach c { ${contrib} } {
system -W ${build.dir} "make -C contrib/src/${c}"
}
+ # remove -arch flags from `wx-config --libs`
+ reinplace -E {s|-arch [a-z0-9_]+||g} lib/wx/config/${wxtype}-unicode-${installtype}-${branch}
}
post-destroot {
Property changes on: users/mojca/wxports/graphics/wxWidgets-3.0
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/dports/graphics/wxWidgets-3.0:110234-110537
/trunk/dports/graphics/wxWidgets-devel:98211-110213
Modified: users/mojca/wxports/graphics/wxWidgets-3.0/Portfile
===================================================================
--- users/mojca/wxports/graphics/wxWidgets-3.0/Portfile 2013-09-01 20:59:49 UTC (rev 110538)
+++ users/mojca/wxports/graphics/wxWidgets-3.0/Portfile 2013-09-01 21:00:51 UTC (rev 110539)
@@ -10,6 +10,7 @@
subport wxPython-3.0 {}
subport wxgtk-3.0 {}
version 2.9.5
+revision 1
set installname wxWidgets
set wxtype osx_cocoa
@@ -19,7 +20,6 @@
} elseif {$subport == "wxPython-3.0"} {
wxWidgets.use wxPython-3.0
version 2.9.4
- set wxpythonsubset wxPython-2.9.4.0-MacPorts-subset
} elseif {$subport == "wxgtk-3.0"} {
# with satisfactory Cocoa support there is no real need for GTK-based wxWidgets any more
# wxgtk-3.0 is here mainly for testing purposes
@@ -73,7 +73,7 @@
# without (the second part of) this patch wxrc-2.9 ends up linking to libraries in workdir
# http://trac.wxwidgets.org/ticket/15452
-patchfiles patch-configure.diff
+patchfiles-append patch-configure.diff
post-patch {
reinplace "s|@@PREFIX@@|${prefix}|g" ${patch.dir}/configure
@@ -98,10 +98,13 @@
--with-macosx-version-min=no
if {$subport == "wxPython-3.0"} {
+ set wxpythonsubset wxPython-2.9.4.0-MacPorts-subset
distfiles-append ${wxpythonsubset}${extract.suffix}:trac
# patch-src-osx-cocoa-window.mm.diff: http://trac.wxwidgets.org/changeset/72195 (only needed for 2.9.4)
- patchfiles-append patch-src-osx-cocoa-window.mm.diff
+ # patch-include-wx-math.h.diff: http://trac.wxwidgets.org/changeset/74456 (only needed for 2.9.4)
+ patchfiles-append patch-src-osx-cocoa-window.mm.diff \
+ patch-include-wx-math.h.diff
description wxWidgets ${branch} for the wxPython distribution
long_description The port installs wxWidgets ${branch} for wxPython \
@@ -130,8 +133,9 @@
# patch-upstream-psn.diff: http://trac.wxwidgets.org/changeset/74703
patchfiles-append patch-sdl.diff \
patch-upstream-psn.diff
-
- depends_lib-append port:cairo \
+
+ depends_build-append path:bin/pkg-config:pkgconfig
+ depends_lib-append path:lib/pkgconfig/cairo.pc:cairo \
path:lib/pkgconfig/sdl.pc:libsdl \
port:libsdl_mixer
@@ -149,13 +153,13 @@
configure.args-append --with-gtk=3
#}
#variant quartz conflicts x11 {
- # require_active_variants cairo quartz
+ # require_active_variants path:lib/pkgconfig/cairo.pc:cairo quartz
# require_active_variants gtk3 quartz
#}
#variant x11 conflicts quartz {
depends_lib-append port:mesa
- require_active_variants cairo x11
- require_active_variants gtk3 x11
+ require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11
+ require_active_variants gtk3 x11
#}
#if{![variant_isset gtk2] && ![variant_isset gtk3]} {
# default_variants-append +gtk3
@@ -178,11 +182,14 @@
#}
}
-# post-destroot {
-# set confscript ${wxWidgets.prefix}/lib/wx/config/${wxtype}-unicode-${branch}
-# ln -sf ${confscript} ${destroot}${wxWidgets.prefix}/bin/wx-config
-# }
+post-destroot {
+ set confscript ${wxWidgets.prefix}/lib/wx/config/${wxtype}-unicode-${branch}
+ ln -sf ${confscript} ${destroot}${wxWidgets.prefix}/bin/wx-config
+ xinstall -m 755 -d ${destroot}${prefix}/share/bakefile/presets
+}
+destroot.keepdirs ${destroot}${prefix}/share/bakefile/presets
+
variant universal {
set archs [join ${configure.universal_archs} ,]
# --disable-precomp-headers is automatically selected with cocoa, but not with gtk
Copied: users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-include-wx-math.h.diff (from rev 110532, trunk/dports/graphics/wxWidgets-3.0/files/patch-include-wx-math.h.diff)
===================================================================
--- users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-include-wx-math.h.diff (rev 0)
+++ users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-include-wx-math.h.diff 2013-09-01 21:00:51 UTC (rev 110539)
@@ -0,0 +1,17 @@
+Upstream: http://trac.wxwidgets.org/changeset/74456
+--- include/wx/math.h (revision 73280)
++++ include/wx/math.h (revision 74456)
+@@ -62,7 +62,12 @@
+ add more compilers with C99 support here: using C99 isfinite() is
+ preferable to using BSD-ish finite()
+ */
+- #define wxFinite(x) isfinite(x)
++ #if defined(_GLIBCXX_CMATH) || defined(_LIBCPP_CMATH)
++ // these <cmath> headers #undef isfinite
++ #define wxFinite(x) std::isfinite(x)
++ #else
++ #define wxFinite(x) isfinite(x)
++ #endif
+ #elif ( defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \
+ defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \
+ defined(__HPUX__) ) && ( !defined(wxOSX_USE_IPHONE) || wxOSX_USE_IPHONE == 0 )
Deleted: users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-src-osx-cocoa-window.mm.diff
===================================================================
--- users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-src-osx-cocoa-window.mm.diff 2013-09-01 20:59:49 UTC (rev 110538)
+++ users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-src-osx-cocoa-window.mm.diff 2013-09-01 21:00:51 UTC (rev 110539)
@@ -1,64 +0,0 @@
-Upstream: http://trac.wxwidgets.org/changeset/72195
---- src/osx/cocoa/window.mm (revision 72169)
-+++ src/osx/cocoa/window.mm (revision 72195)
-@@ -456,4 +456,9 @@
- - (CGFloat)deviceDeltaX;
- - (CGFloat)deviceDeltaY;
-+
-+// 10.7+
-+- (BOOL)hasPreciseScrollingDeltas;
-+- (CGFloat)scrollingDeltaX;
-+- (CGFloat)scrollingDeltaY;
- @end
-
-@@ -610,21 +615,37 @@
- wxevent.SetEventType( wxEVT_MOUSEWHEEL ) ;
-
-- // see http://developer.apple.com/qa/qa2005/qa1453.html
-- // for more details on why we have to look for the exact type
--
-- const EventRef cEvent = (EventRef) [nsEvent eventRef];
-- bool isMouseScrollEvent = false;
-- if ( cEvent )
-- isMouseScrollEvent = ::GetEventKind(cEvent) == kEventMouseScroll;
--
-- if ( isMouseScrollEvent )
-+ if ( UMAGetSystemVersion() >= 0x1070 )
- {
-- deltaX = [nsEvent deviceDeltaX];
-- deltaY = [nsEvent deviceDeltaY];
-+ if ( [nsEvent hasPreciseScrollingDeltas] )
-+ {
-+ deltaX = [nsEvent scrollingDeltaX];
-+ deltaY = [nsEvent scrollingDeltaY];
-+ }
-+ else
-+ {
-+ deltaX = [nsEvent scrollingDeltaX] * 10;
-+ deltaY = [nsEvent scrollingDeltaY] * 10;
-+ }
- }
- else
- {
-- deltaX = ([nsEvent deltaX] * 10);
-- deltaY = ([nsEvent deltaY] * 10);
-+ const EventRef cEvent = (EventRef) [nsEvent eventRef];
-+ // see http://developer.apple.com/qa/qa2005/qa1453.html
-+ // for more details on why we have to look for the exact type
-+
-+ bool isMouseScrollEvent = false;
-+ if ( cEvent )
-+ isMouseScrollEvent = ::GetEventKind(cEvent) == kEventMouseScroll;
-+
-+ if ( isMouseScrollEvent )
-+ {
-+ deltaX = [nsEvent deviceDeltaX];
-+ deltaY = [nsEvent deviceDeltaY];
-+ }
-+ else
-+ {
-+ deltaX = ([nsEvent deltaX] * 10);
-+ deltaY = ([nsEvent deltaY] * 10);
-+ }
- }
-
Copied: users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-src-osx-cocoa-window.mm.diff (from rev 110532, trunk/dports/graphics/wxWidgets-3.0/files/patch-src-osx-cocoa-window.mm.diff)
===================================================================
--- users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-src-osx-cocoa-window.mm.diff (rev 0)
+++ users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-src-osx-cocoa-window.mm.diff 2013-09-01 21:00:51 UTC (rev 110539)
@@ -0,0 +1,64 @@
+Upstream: http://trac.wxwidgets.org/changeset/72195
+--- src/osx/cocoa/window.mm (revision 72169)
++++ src/osx/cocoa/window.mm (revision 72195)
+@@ -456,4 +456,9 @@
+ - (CGFloat)deviceDeltaX;
+ - (CGFloat)deviceDeltaY;
++
++// 10.7+
++- (BOOL)hasPreciseScrollingDeltas;
++- (CGFloat)scrollingDeltaX;
++- (CGFloat)scrollingDeltaY;
+ @end
+
+@@ -610,21 +615,37 @@
+ wxevent.SetEventType( wxEVT_MOUSEWHEEL ) ;
+
+- // see http://developer.apple.com/qa/qa2005/qa1453.html
+- // for more details on why we have to look for the exact type
+-
+- const EventRef cEvent = (EventRef) [nsEvent eventRef];
+- bool isMouseScrollEvent = false;
+- if ( cEvent )
+- isMouseScrollEvent = ::GetEventKind(cEvent) == kEventMouseScroll;
+-
+- if ( isMouseScrollEvent )
++ if ( UMAGetSystemVersion() >= 0x1070 )
+ {
+- deltaX = [nsEvent deviceDeltaX];
+- deltaY = [nsEvent deviceDeltaY];
++ if ( [nsEvent hasPreciseScrollingDeltas] )
++ {
++ deltaX = [nsEvent scrollingDeltaX];
++ deltaY = [nsEvent scrollingDeltaY];
++ }
++ else
++ {
++ deltaX = [nsEvent scrollingDeltaX] * 10;
++ deltaY = [nsEvent scrollingDeltaY] * 10;
++ }
+ }
+ else
+ {
+- deltaX = ([nsEvent deltaX] * 10);
+- deltaY = ([nsEvent deltaY] * 10);
++ const EventRef cEvent = (EventRef) [nsEvent eventRef];
++ // see http://developer.apple.com/qa/qa2005/qa1453.html
++ // for more details on why we have to look for the exact type
++
++ bool isMouseScrollEvent = false;
++ if ( cEvent )
++ isMouseScrollEvent = ::GetEventKind(cEvent) == kEventMouseScroll;
++
++ if ( isMouseScrollEvent )
++ {
++ deltaX = [nsEvent deviceDeltaX];
++ deltaY = [nsEvent deviceDeltaY];
++ }
++ else
++ {
++ deltaX = ([nsEvent deltaX] * 10);
++ deltaY = ([nsEvent deltaY] * 10);
++ }
+ }
+
Property changes on: users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-src-osx-cocoa-window.mm.diff
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/graphics/wxWidgets-devel/files/patch-src-osx-cocoa-window.mm.diff:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/graphics/wxWidgets-3.0/files/patch-src-osx-cocoa-window.mm.diff:110234-110532
/trunk/dports/graphics/wxWidgets-devel/files/patch-src-osx-cocoa-window.mm.diff:98211-110213
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130901/e3e1a921/attachment.html>
More information about the macports-changes
mailing list