diff options
| author | root <root@rshg047.dnsready.net> | 2011-07-08 23:09:34 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-07-08 23:09:34 +0000 |
| commit | d006db78a1ce530e9df8a65f87bf39e8d6cc88e5 (patch) | |
| tree | 082c5c2c39abee82c3957872552fa15c8325744d /community/fldiff | |
| parent | ff64a82ccedcb1690d2f0140d63432aa49676591 (diff) | |
Fri Jul 8 23:09:34 UTC 2011
Diffstat (limited to 'community/fldiff')
| -rw-r--r-- | community/fldiff/PKGBUILD | 24 | ||||
| -rw-r--r-- | community/fldiff/build-fix.patch | 31 | ||||
| -rw-r--r-- | community/fldiff/fldiff.install | 1 |
3 files changed, 47 insertions, 9 deletions
diff --git a/community/fldiff/PKGBUILD b/community/fldiff/PKGBUILD index 2946ef440..ab25a3240 100644 --- a/community/fldiff/PKGBUILD +++ b/community/fldiff/PKGBUILD @@ -1,23 +1,31 @@ -# $Id: PKGBUILD 8588 2010-01-21 01:26:51Z dgriffiths $ +# $Id: PKGBUILD 51104 2011-07-05 09:00:11Z spupykin $ +# 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=5 +pkgrel=6 pkgdesc="graphical diff program" arch=(i686 x86_64) url="http://www.easysw.com/~mike/fldiff/" -source=(http://www.easysw.com/~mike/fldiff/$pkgname-$pkgver-source.tar.gz) license=('GPL') install=fldiff.install depends=('diffutils' 'fltk' 'xdg-utils') -md5sums=('12897c92106fb5d665210a2e82f5cf25') +source=(http://www.easysw.com/~mike/fldiff/$pkgname-$pkgver-source.tar.gz + build-fix.patch) +md5sums=('12897c92106fb5d665210a2e82f5cf25' + 'ea7258e07544b81561c6d76a41c184e7') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver + patch -p1 <$srcdir/build-fix.patch ./configure --prefix=/usr - make || return 1 - make BUILDROOT=$startdir/pkg install install-desktop || return 1 - mv `find $startdir/pkg/ -name Development -type d` $startdir/pkg/usr/share/applications + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make BUILDROOT=$pkgdir install install-desktop + mv `find $pkgdir/ -name Development -type d` $startdir/pkg/usr/share/applications } diff --git a/community/fldiff/build-fix.patch b/community/fldiff/build-fix.patch new file mode 100644 index 000000000..bb3e0245e --- /dev/null +++ b/community/fldiff/build-fix.patch @@ -0,0 +1,31 @@ +Only in fldiff-1.1.my: config.log +Only in fldiff-1.1.my: config.status +Only in fldiff-1.1.my: DiffChooser.o +Only in fldiff-1.1.my: DiffOpenWindow.o +Only in fldiff-1.1.my: DiffView.o +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()); + } +Only in fldiff-1.1.my: DiffWindow.o +Only in fldiff-1.1.my: FavoritesMenu.o +Only in fldiff-1.1.my: FavoritesWindow.o +Only in fldiff-1.1.my: fldiff +Only in fldiff-1.1.my: fldiff.list +Only in fldiff-1.1.my: fldiff.o +Only in fldiff-1.1.my: Makefile +Only in fldiff-1.1.my: PtProcess.o diff --git a/community/fldiff/fldiff.install b/community/fldiff/fldiff.install index b4ee8556f..b95cc069d 100644 --- a/community/fldiff/fldiff.install +++ b/community/fldiff/fldiff.install @@ -9,4 +9,3 @@ post_upgrade() { post_remove() { which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true } - |