From 2bb8a66244272425b77d8803a858dfcf1cf9899c Mon Sep 17 00:00:00 2001 From: "ricky.wu" Date: Sat, 21 Nov 2015 22:57:15 +0800 Subject: [PATCH] fix space issue --- mingw-w64-gtkada/PKGBUILD | 4 +- mingw-w64-gtkada/space_issue.patch | 62 ++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 mingw-w64-gtkada/space_issue.patch diff --git a/mingw-w64-gtkada/PKGBUILD b/mingw-w64-gtkada/PKGBUILD index 1d9954403b..68336dd745 100644 --- a/mingw-w64-gtkada/PKGBUILD +++ b/mingw-w64-gtkada/PKGBUILD @@ -15,7 +15,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc-ada") depends=("${MINGW_PACKAGE_PREFIX}-gcc-ada" "${MINGW_PACKAGE_PREFIX}-gtk3") source=("http://www.pfeifers-software.de/files/GNAT/${_realname}-gpl-${pkgver}-src.tgz" - "gtkada-mingw.diff") + "gtkada-mingw.diff" + "space_issue.patch") sha1sums=('84285ea8c016d18bac8860573ff5223ecea8ecf4' 'ca7dcd32bfbfecdcbd923bb2e12dc5b8b0f91305') @@ -23,6 +24,7 @@ prepare() { cd ${srcdir}/${_realname}-${pkgver}-src patch -p0 < contrib/gtkada-3-win32.diff patch -p1 < ${srcdir}/gtkada-mingw.diff + patch -p1 < ${srcdir}/space_issue.patch } build() { diff --git a/mingw-w64-gtkada/space_issue.patch b/mingw-w64-gtkada/space_issue.patch new file mode 100644 index 0000000000..598aafbef3 --- /dev/null +++ b/mingw-w64-gtkada/space_issue.patch @@ -0,0 +1,62 @@ +diff -rup gtkada-3.8.2-src-org/testgtk/create_css_editor.adb gtkada-3.8.2-src/testgtk/create_css_editor.adb +--- gtkada-3.8.2-src-org/testgtk/create_css_editor.adb 2014-01-06 18:22:20.000000000 +0800 ++++ gtkada-3.8.2-src/testgtk/create_css_editor.adb 2015-11-06 11:13:16.881265500 +0800 +@@ -38,28 +38,28 @@ package body Create_Css_Editor is + + CSS : constant String := + "/* You can edit the text in this window to change the" & ASCII.LF +- &" * appearance of this Window." & ASCII.LF +- &" * Be careful, if you screw it up, nothing might be visible" & ASCII.LF +- &" * anymore. :)" & ASCII.LF +- &" */" & ASCII.LF & ASCII.LF ++ & " * appearance of this Window." & ASCII.LF ++ & " * Be careful, if you screw it up, nothing might be visible" & ASCII.LF ++ & " * anymore. :)" & ASCII.LF ++ & " */" & ASCII.LF & ASCII.LF + +- &"/* This CSS resets all properties to their defaults values" & ASCII.LF +- &" * and overrides all user settings and the theme in use */" & ASCII.LF ++ & "/* This CSS resets all properties to their defaults values" & ASCII.LF ++ & " * and overrides all user settings and the theme in use */" & ASCII.LF + & ASCII.LF + +- &"/* Set a very futuristic style by default */" & ASCII.LF & ASCII.LF ++ & "/* Set a very futuristic style by default */" & ASCII.LF & ASCII.LF + +- &"* {" & ASCII.LF +- &" color: green;" & ASCII.LF +- &" font-family: Monospace;" & ASCII.LF +- &" border: 1px solid;" & ASCII.LF +- &"}" & ASCII.LF +- +- &"/* Make sure selections are visible */" & ASCII.LF +- &":selected {" & ASCII.LF +- &" background-color: darkGreen;" & ASCII.LF +- &" color: black;" & ASCII.LF +- &"}"; ++ & "* {" & ASCII.LF ++ & " color: green;" & ASCII.LF ++ & " font-family: Monospace;" & ASCII.LF ++ & " border: 1px solid;" & ASCII.LF ++ & "}" & ASCII.LF ++ ++ & "/* Make sure selections are visible */" & ASCII.LF ++ & ":selected {" & ASCII.LF ++ & " background-color: darkGreen;" & ASCII.LF ++ & " color: black;" & ASCII.LF ++ & "}"; + + Last_Working_Css : Unbounded_String := To_Unbounded_String (CSS); + Error : aliased Glib.Error.GError; +diff -rup gtkada-3.8.2-src-org/testgtk/create_print.adb gtkada-3.8.2-src/testgtk/create_print.adb +--- gtkada-3.8.2-src-org/testgtk/create_print.adb 2014-01-06 18:22:20.000000000 +0800 ++++ gtkada-3.8.2-src/testgtk/create_print.adb 2015-11-06 11:20:56.435618300 +0800 +@@ -127,7 +127,7 @@ package body Create_Print is + Close_Path (Cr); + + Set_Source_Rgb (Cr, 0.0, 0.0, 0.0); +- Set_Line_Width (Cr, 1.0/16.0); ++ Set_Line_Width (Cr, 1.0 / 16.0); + Set_Line_Cap (Cr, Cairo_Line_Cap_Round); + Set_Line_Join (Cr, Cairo_Line_Join_Round); + Cairo.Stroke (Cr);