diff options
| -rw-r--r-- | .SRCINFO | 17 | ||||
| -rw-r--r-- | PKGBUILD | 30 | ||||
| -rw-r--r-- | build-fix.patch | 18 |
3 files changed, 65 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..6059e0e781f6 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,17 @@ +pkgbase = fldiff + pkgdesc = graphical diff program + pkgver = 1.1 + pkgrel = 10 + url = http://directory.fsf.org/wiki/Fldiff + arch = x86_64 + license = GPL + depends = diffutils + depends = fltk + depends = xdg-utils + source = http://ftp.de.debian.org/debian/pool/main/f/fldiff/fldiff_1.1+0.orig.tar.gz + source = build-fix.patch + md5sums = 12897c92106fb5d665210a2e82f5cf25 + md5sums = 4f6418cb0cbc33aca28a760738ea6f18 + +pkgname = fldiff + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..00dac56cb288 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 266875 2017-11-15 14:29:11Z foutrelis $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: kevin <kevin@archlinux.org> +# Contributor: iztok pizorn <pizorn@gmail.com> + +pkgname=fldiff +pkgver=1.1 +pkgrel=10 +pkgdesc="graphical diff program" +arch=(x86_64) +url="http://directory.fsf.org/wiki/Fldiff" +license=('GPL') +depends=('diffutils' 'fltk' 'xdg-utils') +source=("http://ftp.de.debian.org/debian/pool/main/f/fldiff/fldiff_$pkgver+0.orig.tar.gz" + build-fix.patch) +md5sums=('12897c92106fb5d665210a2e82f5cf25' + '4f6418cb0cbc33aca28a760738ea6f18') + +build() { + cd "$srcdir"/$pkgname-$pkgver + patch -p1 <"$srcdir"/build-fix.patch + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make BUILDROOT="$pkgdir" install install-desktop + mv `find "$pkgdir"/ -name Development -type d` "$pkgdir"/usr/share/applications +} diff --git a/build-fix.patch b/build-fix.patch new file mode 100644 index 000000000000..bbc6c76150e2 --- /dev/null +++ b/build-fix.patch @@ -0,0 +1,18 @@ +diff -wbBur fldiff-1.1/DiffWindow.cxx fldiff-1.1.my/DiffWindow.cxx +--- fldiff-1.1/DiffWindow.cxx 2006-11-13 21:54:02.000000000 +0300 ++++ fldiff-1.1.my/DiffWindow.cxx 2011-07-05 12:58:38.000000000 +0400 +@@ -1126,11 +1126,11 @@ + DiffWindow::save_prefs() + { + // Save the window prefs for the next run... +- prefs_.set("color", color()); +- prefs_.set("selection_color", selection_color()); ++ prefs_.set("color", (int)color()); ++ prefs_.set("selection_color", (int)selection_color()); + prefs_.set("showlinenum", showlinenum()); + prefs_.set("tabwidth", tabwidth()); +- prefs_.set("textcolor", textcolor()); ++ prefs_.set("textcolor", (int)textcolor()); + prefs_.set("textsize", textsize()); + prefs_.set("ignoreblanks", ignoreblanks()); + } |