[75676] trunk/dports/science

ryandesign at macports.org ryandesign at macports.org
Thu Feb 3 17:58:32 PST 2011


Revision: 75676
          http://trac.macports.org/changeset/75676
Author:   ryandesign at macports.org
Date:     2011-02-03 17:58:32 -0800 (Thu, 03 Feb 2011)
Log Message:
-----------
peekabot: maintainer update to 0.8.4; see #28206

Modified Paths:
--------------
    trunk/dports/science/peekabot/Portfile
    trunk/dports/science/peekabot-client/Portfile
    trunk/dports/science/peekabot-client/files/patch-disable_compression.diff
    trunk/dports/science/peekabot-server/Portfile

Added Paths:
-----------
    trunk/dports/science/peekabot-server/files/patch-group-icon.diff

Removed Paths:
-------------
    trunk/dports/science/peekabot-server/files/patch-xercesc3.diff

Modified: trunk/dports/science/peekabot/Portfile
===================================================================
--- trunk/dports/science/peekabot/Portfile	2011-02-04 01:53:47 UTC (rev 75675)
+++ trunk/dports/science/peekabot/Portfile	2011-02-04 01:58:32 UTC (rev 75676)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 
 name                    peekabot
-version                 0.7.2
+version                 0.8.4
 categories              science devel
 maintainers             gimaker.se:staffan \
                         openmaintainer

Modified: trunk/dports/science/peekabot-client/Portfile
===================================================================
--- trunk/dports/science/peekabot-client/Portfile	2011-02-04 01:53:47 UTC (rev 75675)
+++ trunk/dports/science/peekabot-client/Portfile	2011-02-04 01:58:32 UTC (rev 75676)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 
 name                    peekabot-client
-version                 0.7.2
+version                 0.8.4
 categories              science devel
 maintainers             gimaker.se:staffan \
                         openmaintainer
@@ -21,9 +21,8 @@
 use_bzip2               yes
 use_parallel_build      yes
 
-checksums               md5 091f588e3b1931de2454539c797f7526 \
-                        sha1 f4d42249059af92db8b70fd12c48c9c3e990cd95 \
-                        rmd160 24861d4dc9dcf87f41c2ddb159a709958d1a7f65
+checksums               sha1    418a38978bf8ebf4d8d7eb518dbcea9a01887217 \
+                        rmd160  45c7b659c87ca361e2a1f28537a041bd04c9422b
 
 depends_lib             port:boost
 

Modified: trunk/dports/science/peekabot-client/files/patch-disable_compression.diff
===================================================================
--- trunk/dports/science/peekabot-client/files/patch-disable_compression.diff	2011-02-04 01:53:47 UTC (rev 75675)
+++ trunk/dports/science/peekabot-client/files/patch-disable_compression.diff	2011-02-04 01:58:32 UTC (rev 75676)
@@ -1,7 +1,6 @@
-=== modified file 'src/client/ServerConnection.cc'
---- src/client/ServerConnection.cc	2009-06-26 08:09:49 +0000
-+++ src/client/ServerConnection.cc	2010-06-16 15:00:01 +0000
-@@ -307,7 +307,7 @@
+--- src/client/ServerConnection.cc.orig	2010-09-08 06:52:48.000000000 -0500
++++ src/client/ServerConnection.cc	2011-02-03 16:14:38.000000000 -0600
+@@ -303,7 +303,7 @@
      assert( uncomp_len > 0 );
  
      // Compress data?
@@ -10,4 +9,3 @@
      {
          // require at least 5% compression, or it's not worth the effort
          boost::scoped_array<boost::uint8_t> comp(
-

Modified: trunk/dports/science/peekabot-server/Portfile
===================================================================
--- trunk/dports/science/peekabot-server/Portfile	2011-02-04 01:53:47 UTC (rev 75675)
+++ trunk/dports/science/peekabot-server/Portfile	2011-02-04 01:58:32 UTC (rev 75676)
@@ -4,8 +4,7 @@
 PortSystem              1.0
 
 name                    peekabot-server
-version                 0.7.2
-revision                1
+version                 0.8.4
 categories              science devel
 maintainers             gimaker.se:staffan \
                         openmaintainer
@@ -22,25 +21,32 @@
 use_bzip2               yes
 use_parallel_build      yes
 
-checksums               md5 091f588e3b1931de2454539c797f7526 \
-                        sha1 f4d42249059af92db8b70fd12c48c9c3e990cd95 \
-                        rmd160 24861d4dc9dcf87f41c2ddb159a709958d1a7f65
+checksums               ${distfiles} \
+                        sha1    418a38978bf8ebf4d8d7eb518dbcea9a01887217 \
+                        rmd160  45c7b659c87ca361e2a1f28537a041bd04c9422b
 
 depends_lib             port:boost \
                         port:xercesc3 \
-                        port:fltk \
-                        port:libpng \
+                        port:gtkmm \
+                        port:gtkglextmm \
                         port:freetype
 
 depends_build           port:pkgconfig
 
-# FLTK 1.1.x doesn't build on x86_64
-supported_archs         i386 ppc
-# Disable the universal build since we can't compile in 64-bit mode, see below.
-universal_variant       no
-
 configure.args          --disable-client-lib
 
-# Patch it up to make it compatible with the API changes in Xerces-C++ 3.x
-patchfiles              patch-xercesc3.diff
+# Catch errors trying to load the gtk-directory stock icon for use as the
+# icon for group objects. Instead of terminating on an uncaught exception,
+# this leaves the icon used for groups blank.
+#
+# This problem is present when the hicolor-icon-theme is used, but not when
+# e.g. the gnome-icon-theme is used.
+patchfiles-append       patch-group-icon.diff
 
+# Rendering to pixmaps seems to be broken with XQuartz; patch the sources
+# to use FBOs to render screenshots rather than using pixmaps.
+patch_sites             http://svn.macports.org/repository/macports/distfiles/peekabot
+patchfiles-append       patch-fbo-screenshots.diff.bz2
+checksums-append        patch-fbo-screenshots.diff.bz2 \
+                        sha1    ca5a79092c7c52b8fdc1dadf0004173fe779a34f \
+                        rmd160  8e74cfd86ed935cabbaca88fb109ce6abbf71d91

Added: trunk/dports/science/peekabot-server/files/patch-group-icon.diff
===================================================================
--- trunk/dports/science/peekabot-server/files/patch-group-icon.diff	                        (rev 0)
+++ trunk/dports/science/peekabot-server/files/patch-group-icon.diff	2011-02-04 01:58:32 UTC (rev 75676)
@@ -0,0 +1,21 @@
+--- src/gui/Gui.cc.orig	2011-01-29 03:41:27.000000000 +0100
++++ src/gui/Gui.cc	2011-01-29 03:43:39.000000000 +0100
+@@ -75,9 +75,15 @@
+     load_stock_icons(icon_dir);
+ 
+     // Create the group icon from the stock directory icon
+-    Gtk::IconTheme::add_builtin_icon(
+-        "peekabot-group", 16,
+-        Gtk::IconTheme::get_default()->load_icon("gtk-directory", 16));
++    try
++    {
++        Gtk::IconTheme::add_builtin_icon(
++            "peekabot-group", 16,
++            Gtk::IconTheme::get_default()->load_icon("gtk-directory", 16));
++    }
++    catch(...)
++    {
++    }
+ 
+     // Load the GUI from the Glade file
+     boost::filesystem::path ui_path =

Deleted: trunk/dports/science/peekabot-server/files/patch-xercesc3.diff
===================================================================
--- trunk/dports/science/peekabot-server/files/patch-xercesc3.diff	2011-02-04 01:53:47 UTC (rev 75675)
+++ trunk/dports/science/peekabot-server/files/patch-xercesc3.diff	2011-02-04 01:58:32 UTC (rev 75676)
@@ -1,26 +0,0 @@
-=== modified file 'src/XercesParser.cc'
---- src/XercesParser.cc	2009-03-23 18:18:47 +0000
-+++ src/XercesParser.cc	2010-06-16 15:00:39 +0000
-@@ -282,7 +282,7 @@
- }
- 
- void XercesParser::XercesHandler::characters(const XMLCh* const chars,
--                                             const unsigned int length)
-+                                             const XMLSize_t length)
- {
-     update_line_info();
- 
-
-=== modified file 'src/XercesParser.hh'
---- src/XercesParser.hh	2009-05-20 14:07:50 +0000
-+++ src/XercesParser.hh	2010-06-16 15:00:39 +0000
-@@ -105,7 +105,7 @@
-             
-             virtual void characters(
-                 const XMLCh* const chars,
--                const unsigned int length);
-+                const XMLSize_t length);
-        
-             virtual void error(
-                 const xercesc::SAXParseException& exception)
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110203/90d1306e/attachment-0001.html>


More information about the macports-changes mailing list