[arch-commits] Commit in bless/trunk (PKGBUILD bless_0.6.0-5+fix-savingfiles.patch)
Balló György
bgyorgy at archlinux.org
Sat Jan 13 15:21:12 UTC 2018
Date: Saturday, January 13, 2018 @ 15:21:03
Author: bgyorgy
Revision: 281821
upgpkg: bless 0.6.0-5
Adopt the package, fix saving preferences (FS#56948)
Added:
bless/trunk/bless_0.6.0-5+fix-savingfiles.patch
Modified:
bless/trunk/PKGBUILD
-------------------------------------+
PKGBUILD | 31 +++++++++++++++++------------
bless_0.6.0-5+fix-savingfiles.patch | 36 ++++++++++++++++++++++++++++++++++
2 files changed, 54 insertions(+), 13 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-01-13 15:07:00 UTC (rev 281820)
+++ PKGBUILD 2018-01-13 15:21:03 UTC (rev 281821)
@@ -1,34 +1,39 @@
# $Id$
-# Maintainer: TDY <tdy at gmx.com>
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: TDY <tdy at gmx.com>
# Contributor: dcraven <dcraven at gmail.com>
pkgname=bless
pkgver=0.6.0
-pkgrel=4
-pkgdesc="A high-quality, full-featured hex editor"
+pkgrel=5
+pkgdesc="High-quality, full-featured hex editor"
arch=('any')
-url="http://home.gna.org/bless/"
+url="https://web.archive.org/web/20170503150524/http://home.gna.org/bless/"
license=('GPL')
-depends=('gtk-sharp-2>=2.8')
-makedepends=('gettext' 'pkgconfig' 'rarian')
-validpgpkeys=('3C6854719142638FAF86DAEF0011ABB5F6E68924')
-source=(http://http.debian.net/debian/pool/main/b/bless/bless_$pkgver.orig.tar.gz)
-md5sums=('b4c20d113281dfedb67d9f3ff8b174e3')
+depends=('gtk-sharp-2')
+makedepends=('rarian')
+source=(http://http.debian.net/debian/pool/main/b/$pkgname/${pkgname}_$pkgver.orig.tar.gz
+ bless_0.6.0-5+fix-savingfiles.patch)
+sha256sums=('34dc984c35df19184e5b61a4b11fe79901c417693f57d874dc70ef0c58896de1'
+ '3068969d1125cf65cd27c523dcdbb153e14832c1dfb61f313fc9d68607c279c0')
prepare() {
cd $pkgname-$pkgver
+ sed -i 's/gmcs/mcs/' configure{,.ac} builder/ModuleBuilder.cs
- # Build for mono 4.0 (FS#37299)
- sed -i 's/gmcs/dmcs/' configure{,.ac} builder/ModuleBuilder.cs
+ # Fix saving preferences
+ patch -Np1 -i ../bless_0.6.0-5+fix-savingfiles.patch
+
+ autoreconf -fi
}
build() {
cd $pkgname-$pkgver
- ./configure --prefix=/usr --without-scrollkeeper
+ ./configure --prefix=/usr
make
}
package() {
cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" MKDIR_P='mkdir -p' install
}
Added: bless_0.6.0-5+fix-savingfiles.patch
===================================================================
--- bless_0.6.0-5+fix-savingfiles.patch (rev 0)
+++ bless_0.6.0-5+fix-savingfiles.patch 2018-01-13 15:21:03 UTC (rev 281821)
@@ -0,0 +1,36 @@
+diff -Naurd bless-0.6.0.orig/src/tools/Preferences.cs bless-0.6.0/src/tools/Preferences.cs
+--- bless-0.6.0.orig/src/tools/Preferences.cs 2008-06-07 14:18:14.000000000 +0200
++++ bless-0.6.0/src/tools/Preferences.cs 2016-10-28 22:47:50.000000000 +0200
+@@ -127,10 +127,10 @@
+ ///</summary>
+ public void Save(string path)
+ {
+- XmlTextWriter xml = new XmlTextWriter(path, null);
+- xml.Formatting = Formatting.Indented;
+- xml.Indentation = 1;
+- xml.IndentChar = '\t';
++ XmlWriterSettings settings = new XmlWriterSettings();
++ settings.Indent = true;
++ settings.IndentChars = ("\t");
++ XmlWriter xml = XmlWriter.Create(path, settings);
+
+ xml.WriteStartElement(null, "preferences", null);
+
+diff -Naurd bless-0.6.0.orig/src/tools/Session.cs bless-0.6.0/src/tools/Session.cs
+--- bless-0.6.0.orig/src/tools/Session.cs 2008-06-07 14:18:14.000000000 +0200
++++ bless-0.6.0/src/tools/Session.cs 2017-01-08 15:21:29.000000000 +0100
+@@ -72,10 +72,10 @@
+
+ public void Save(string path)
+ {
+- XmlTextWriter xml = new XmlTextWriter(path, null);
+- xml.Formatting = Formatting.Indented;
+- xml.Indentation = 1;
+- xml.IndentChar = '\t';
++ XmlWriterSettings settings = new XmlWriterSettings();
++ settings.Indent = true;
++ settings.IndentChars = ("\t");
++ XmlWriter xml = XmlWriter.Create(path, settings);
+
+ xml.WriteStartElement(null, "session", null);
+
More information about the arch-commits
mailing list