diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | uncrust66_leftright.patch | 28 |
3 files changed, 36 insertions, 4 deletions
@@ -1,5 +1,3 @@ -# Generated by mksrcinfo v8 -# Sat Apr 29 01:47:08 UTC 2017 pkgbase = universalindentgui-svn pkgdesc = A GUI for GNU Indent, Uncrustify, Artistic Styler, PHP Stylist, Ruby Beautify, HTML Tidy and many other pkgver = r1077 @@ -19,19 +17,21 @@ pkgbase = universalindentgui-svn optdepends = python: needed for some scripts optdepends = gawk: needed for some scripts provides = universalindentgui - conflicts = universalindentgui + conflicts = uncrustify<0.66 source = universalindent-code::svn://svn.code.sf.net/p/universalindent/code/trunk source = universalindentgui.desktop source = universalindentgui.png source = noupdatecheck.patch source = fix_about_dialog.patch source = qscintilla.patch + source = uncrust66_leftright.patch sha256sums = SKIP sha256sums = e6ed8674345d76c1f3e5ab4d6f23b64bfa7ba77141436ff325d72a28cb672a06 sha256sums = cc01fcc94cc2067e499b15189a2ac56a901562218951bd77650cf8f81bcf440d sha256sums = b5b4d6b5604fbaaa8578a97e3a59c709bb0e1861ffaae1add3ca4452c76b5686 sha256sums = 254e237064e8422b4d219fadfaa8486a5a69b3561b8aa81df8faf3c13272e7c5 sha256sums = a06a47f5a9abbb4dded6fc2977c257fa99eec348805cc27f9b93793d42fdd422 + sha256sums = 55f985d32d56d83c29404456e24e274d73168c2fab3486c3f520603689e0b6d3 pkgname = universalindentgui-svn @@ -10,6 +10,7 @@ arch=('i686' 'x86_64') license=('GPL') provides=('universalindentgui') conflicts=('universalindentgui') +conflicts=('uncrustify<0.66') depends=('qt4' 'qscintilla-qt4') makedepends=('subversion') optdepends=( @@ -29,6 +30,7 @@ source=("$_svnmod::svn://svn.code.sf.net/p/universalindent/code/trunk" "noupdatecheck.patch" "fix_about_dialog.patch" "qscintilla.patch" + "uncrust66_leftright.patch" ) sha256sums=('SKIP' @@ -36,7 +38,8 @@ sha256sums=('SKIP' 'cc01fcc94cc2067e499b15189a2ac56a901562218951bd77650cf8f81bcf440d' 'b5b4d6b5604fbaaa8578a97e3a59c709bb0e1861ffaae1add3ca4452c76b5686' '254e237064e8422b4d219fadfaa8486a5a69b3561b8aa81df8faf3c13272e7c5' - 'a06a47f5a9abbb4dded6fc2977c257fa99eec348805cc27f9b93793d42fdd422') + 'a06a47f5a9abbb4dded6fc2977c257fa99eec348805cc27f9b93793d42fdd422' + '55f985d32d56d83c29404456e24e274d73168c2fab3486c3f520603689e0b6d3') prepare() { cd ${srcdir} @@ -49,6 +52,7 @@ prepare() { patch -p1 -i ../noupdatecheck.patch patch -p1 -i ../fix_about_dialog.patch patch -p1 -i ../qscintilla.patch + patch -p1 -i ../uncrust66_leftright.patch } pkgver() { diff --git a/uncrust66_leftright.patch b/uncrust66_leftright.patch new file mode 100644 index 000000000000..df00630d4411 --- /dev/null +++ b/uncrust66_leftright.patch @@ -0,0 +1,28 @@ +diff -ur a/indenters/uigui_uncrustify.ini b/indenters/uigui_uncrustify.ini +--- a/indenters/uigui_uncrustify.ini 2018-03-11 18:42:45.149597018 -0400 ++++ b/indenters/uigui_uncrustify.ini 2018-03-11 18:48:23.309592423 -0400 +@@ -1733,10 +1733,10 @@ + + [Align Number Left] + Category=3 +-Description="<html>Whether to left-align numbers</html>" ++Description="<html>Whether to right-align numbers</html>" + Enabled=false + EditorType=boolean +-TrueFalse=align_number_left=true|align_number_left=false ++TrueFalse=align_number_right=true|align_number_right=false + ValueDefault=0 + + [Align Func Params] +diff -ur a/tools/uncrustify.cfg b/tools/uncrustify.cfg +--- a/tools/uncrustify.cfg 2018-03-11 18:42:45.149597018 -0400 ++++ b/tools/uncrustify.cfg 2018-03-11 18:48:23.379592422 -0400 +@@ -32,7 +32,7 @@ + align_keep_tabs=false + align_with_tabs=false + align_on_tabstop=false +-align_number_left=false ++align_number_right=false + align_func_params=false + align_same_func_call_params=false + align_var_def_colon=false |