[tuxguitar] Set SWT_GTK3=0 workaround for blank setting dialogs. RHBZ#1187848

Orcan Ogetbil oget at fedoraproject.org
Tue Feb 3 05:27:00 UTC 2015


commit 164d2b341694b7a1855459f8377514da24d64ad1
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Tue Feb 3 00:26:48 2015 -0500

    Set SWT_GTK3=0 workaround for blank setting dialogs. RHBZ#1187848

 tuxguitar-build-fedora.xml           |    2 ++
 tuxguitar-style-buttons-height.patch |   19 +++++++++++++++++++
 tuxguitar.spec                       |    8 +++++++-
 3 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/tuxguitar-build-fedora.xml b/tuxguitar-build-fedora.xml
index d869edb..dd21859 100644
--- a/tuxguitar-build-fedora.xml
+++ b/tuxguitar-build-fedora.xml
@@ -124,6 +124,7 @@
 		<echo file="${file.script}" append="true">LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${MOZILLA_FIVE_HOME}${line.separator}</echo>
 		<echo file="${file.script}" append="true">##CLASSPATH${line.separator}</echo>
 		<echo file="${file.script}" append="true">CLASSPATH=$CLASSPATH:${dist.jar.path}${build.jar}:${lib.swt.jar}:${path.itext}:${dist.share.path}${line.separator}</echo>
+		<echo file="${file.script}" append="true">SWT_GTK3=0${line.separator}</echo>
 		<echo file="${file.script}" append="true">##MAINCLASS${line.separator}</echo>
 		<echo file="${file.script}" append="true">MAINCLASS=org.herac.tuxguitar.gui.TGMain${line.separator}</echo>
 		<echo file="${file.script}" append="true">##JVM ARGUMENTS${line.separator}</echo>
@@ -132,6 +133,7 @@
 		<echo file="${file.script}" append="true">export CLASSPATH${line.separator}</echo>
 		<echo file="${file.script}" append="true">export LD_LIBRARY_PATH${line.separator}</echo>
 		<echo file="${file.script}" append="true">export MOZILLA_FIVE_HOME${line.separator}</echo>
+		<echo file="${file.script}" append="true">export SWT_GTK3${line.separator}</echo>
 		<echo file="${file.script}" append="true">arg=""${line.separator}</echo>
 		<echo file="${file.script}" append="true">if [ ! "$1" ] ; then arg="${dist.default.song}"; fi${line.separator}</echo>
 		<echo file="${file.script}" append="true">##LAUNCH${line.separator}</echo>
diff --git a/tuxguitar-style-buttons-height.patch b/tuxguitar-style-buttons-height.patch
new file mode 100644
index 0000000..856ecfb
--- /dev/null
+++ b/tuxguitar-style-buttons-height.patch
@@ -0,0 +1,19 @@
+diff -rupN tuxguitar-src-1.2.org/TuxGuitar/src/org/herac/tuxguitar/gui/system/config/items/StylesOption.java tuxguitar-src-1.2/TuxGuitar/src/org/herac/tuxguitar/gui/system/config/items/StylesOption.java
+--- tuxguitar-src-1.2.org/TuxGuitar/src/org/herac/tuxguitar/gui/system/config/items/StylesOption.java	2009-10-31 10:32:53.000000000 -0400
++++ tuxguitar-src-1.2/TuxGuitar/src/org/herac/tuxguitar/gui/system/config/items/StylesOption.java	2015-02-03 00:04:34.017147098 -0500
+@@ -23,7 +23,7 @@ import org.herac.tuxguitar.gui.system.co
+ 
+ public class StylesOption extends Option{
+ 	private static final int BUTTON_WIDTH = 200;
+-	private static final int BUTTON_HEIGHT = 0;
++	private static final int BUTTON_HEIGHT = 20;
+ 	
+ 	protected boolean initialized;
+ 	protected FontData defaultFontData;
+@@ -358,4 +358,4 @@ public class StylesOption extends Option
+ 			return this.value;
+ 		}
+ 	}
+-}
+\ No newline at end of file
++}
diff --git a/tuxguitar.spec b/tuxguitar.spec
index 298b027..fc4c2ed 100644
--- a/tuxguitar.spec
+++ b/tuxguitar.spec
@@ -1,7 +1,7 @@
 Summary:          A multitrack tablature editor and player written in Java-SWT
 Name:             tuxguitar
 Version:          1.2
-Release:          18%{?dist}
+Release:          19%{?dist}
 URL:              http://www.tuxguitar.com.ar
 Source0:          http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
 # Fedora specific build script. Accepted by upstream:
@@ -13,6 +13,8 @@ Patch0:           %{name}-plugin-properties.patch
 # Disable cairo graphics to prevent garbled output on "Score Edition Mode" RHBZ#827746,859734
 # https://sourceforge.net/tracker/?func=detail&aid=3571052&group_id=155855&atid=797448
 Patch1:           %{name}-no-cairographics.patch
+# Workaround for style setting buttons not displaying properly RHBZ#1187848
+Patch2:           %{name}-style-buttons-height.patch
 License:          LGPLv2+
 Group:            Applications/Multimedia
 
@@ -45,6 +47,7 @@ tempo management, gp3/gp4/gp5 import and export.
 %patch0 -p1
 cp %{SOURCE1} TuxGuitar/xml/build-fedora.xml
 %patch1 -p1
+%patch2 -p1
 
 # Set debug="true" on javac part of the build scripts.
 for file in $(find . -name build.xml); do
@@ -154,6 +157,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{_bindir}/%{name}
 
 %changelog
+* Tue Feb 02 2015 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.2-19
+- Set SWT_GTK3=0 workaround for blank setting dialogs. RHBZ#1187848
+
 * Sat Sep 27 2014 Rex Dieter <rdieter at fedoraproject.org> 1.2-18
 - update mime scriptlets
 


More information about the scm-commits mailing list