[144588] trunk/dports/math/octave-devel

mcalhoun at macports.org mcalhoun at macports.org
Wed Jan 13 01:26:10 PST 2016


Revision: 144588
          https://trac.macports.org/changeset/144588
Author:   mcalhoun at macports.org
Date:     2016-01-13 01:26:10 -0800 (Wed, 13 Jan 2016)
Log Message:
-----------
octave-devel-rc, octave-devel-release: apply upstream patch to change alignment of dock widget titles

Modified Paths:
--------------
    trunk/dports/math/octave-devel/Portfile

Added Paths:
-----------
    trunk/dports/math/octave-devel/files/patch-e870a68742a6.diff

Modified: trunk/dports/math/octave-devel/Portfile
===================================================================
--- trunk/dports/math/octave-devel/Portfile	2016-01-13 09:22:02 UTC (rev 144587)
+++ trunk/dports/math/octave-devel/Portfile	2016-01-13 09:26:10 UTC (rev 144588)
@@ -42,7 +42,7 @@
 
 subport octave-devel-rc {
     version         ${version_rc}
-    #revision        0
+    revision        1
     hg.tag          20b17dda0e0c
 
     if {${version_rc} eq ${version_release}} {
@@ -53,6 +53,10 @@
     patchfiles-append \
         octave-clang-classdef.patch
 
+    # see http://savannah.gnu.org/bugs/?func=detailitem&item_id=46592
+    patchfiles-append \
+        patch-e870a68742a6.diff
+
     checksums-append               \
         ${hg.tag}${extract.suffix} \
         rmd160  bc42b7b3b2a4fca3b1264203bad4cbc3e941206e \
@@ -63,7 +67,7 @@
 
 subport octave-devel-release {
     version         ${version_release}
-    #revision        0
+    revision        1
     hg.tag          3ccc2d02e64b
 
     if {${version_release} eq ${version_rc}} {
@@ -74,6 +78,10 @@
     patchfiles-append \
         octave-clang-classdef.patch
 
+    # see http://savannah.gnu.org/bugs/?func=detailitem&item_id=46592
+    patchfiles-append \
+        patch-e870a68742a6.diff
+
     checksums-append               \
         ${hg.tag}${extract.suffix} \
         rmd160  4bbcc004ffdde859b0735e602aac2d01388d0b2c \

Added: trunk/dports/math/octave-devel/files/patch-e870a68742a6.diff
===================================================================
--- trunk/dports/math/octave-devel/files/patch-e870a68742a6.diff	                        (rev 0)
+++ trunk/dports/math/octave-devel/files/patch-e870a68742a6.diff	2016-01-13 09:26:10 UTC (rev 144588)
@@ -0,0 +1,44 @@
+
+# HG changeset patch
+# User Torsten <ttl at justmail.de>
+# Date 1449207825 -3600
+# Node ID e870a68742a6c6e86333c72956aa31ceb7986131
+# Parent  f7b0572fff6e5e555a3ecea2ee5c9bf8b6798910
+change alignment of dock widget titles for OSX (bug #46592)
+
+* octave-dock-widget.cc (set_style): change alignment in style sheet for OSX
+
+diff --git a/libgui/src/octave-dock-widget.cc b/libgui/src/octave-dock-widget.cc
+--- libgui/src/octave-dock-widget.cc
++++ libgui/src/octave-dock-widget.cc
+@@ -330,6 +330,11 @@
+   else
+     dock_icon = "widget-undock";
+ 
++#if defined (Q_OS_MAC)
++  QString alignment = "center";
++#else
++  QString alignment = "center left";
++#endif
+   if (_custom_style)
+     {
+ 
+@@ -371,7 +376,7 @@
+       css = background + QString (" color: %1 ;").arg (fg_col.name ());
+ #else
+       css = QString ("QDockWidget::title { " + background +
+-                     "                     text-align: center left;"
++                     "                     text-align: " + alignment + ";"
+                      "                     padding: 0px 0px 0px 4px;}\n"
+                      "QDockWidget { color: %1 ; "
+                      "  titlebar-close-icon: url(:/actions/icons/widget-close%2.png);"
+@@ -387,7 +392,7 @@
+ #if defined (Q_OS_WIN32)
+       css = QString ("");
+ #else
+-      css = QString ("QDockWidget::title { text-align: center left;"
++      css = QString ("QDockWidget::title { text-align: " + alignment + ";"
+                      "                     padding: 0px 0px 0px 4px;}"
+                      "QDockWidget {"
+                      "  titlebar-close-icon: url(:/actions/icons/widget-close.png);"
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160113/9e1e4f34/attachment.html>


More information about the macports-changes mailing list