Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b709f577d3872c48977dba1c647e3c958201ba32
commit b709f577d3872c48977dba1c647e3c958201ba32 Author: Pingax <pin...@frugalware.fr> Date: Wed Sep 21 09:36:53 2011 +0200 fldiff-1.1-4-i686 * Rebuilt with fltk-1.3.0 * Added patch to fix build diff --git a/source/xapps-extra/fldiff/FrugalBuild b/source/xapps-extra/fldiff/FrugalBuild index 0275759..81c6e57 100644 --- a/source/xapps-extra/fldiff/FrugalBuild +++ b/source/xapps-extra/fldiff/FrugalBuild @@ -4,21 +4,23 @@ pkgname=fldiff pkgver=1.1 -pkgrel=3 +pkgrel=4 pkgdesc="graphical diff program." url="http://www.easysw.com/~mike/fldiff/"; -depends=('diffutils' 'fltk>=1.1.10') +depends=('diffutils' 'fltk>=1.3.0' 'libxinerama') groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url | grep -m1 '.tar.gz' | sed 's/.*diff-\(.*\)-.*/\1/'" -source=(http://www.easysw.com/~mike/fldiff/$pkgname-$pkgver-source.tar.gz) -sha1sums=('44cf02cc93308144a26ae670d63e892dcd6ea7fb') +source=(http://www.easysw.com/~mike/fldiff/$pkgname-$pkgver-source.tar.gz buildfix.patch) +sha1sums=('d0193493fbf4d964e996d660ff82c3a480ab3993' \ + 'f154e6f923ca5fe6afdfb5fb704c1e3293b264ec') _F_desktop_name="FLdiff" _F_desktop_icon="fldiff" _F_desktop_categories="Development;" build() { + Fpatchall Fmake make BUILDROOT=$Fdestdir install || return 1 Ficonrel fldiff.png diff --git a/source/xapps-extra/fldiff/buildfix.patch b/source/xapps-extra/fldiff/buildfix.patch new file mode 100644 index 0000000..727eb30 --- /dev/null +++ b/source/xapps-extra/fldiff/buildfix.patch @@ -0,0 +1,40 @@ +--- DiffWindow.cxx.orig 2011-09-21 09:22:19.921002567 +0200 ++++ DiffWindow.cxx 2010-12-21 20:41:45.000000000 +0100 +@@ -1,5 +1,5 @@ + // +-// "$Id: DiffWindow.cxx 407 2006-11-13 18:54:02Z mike $" ++// "$Id$" + // + // DiffWindow widget code. + // +@@ -58,7 +58,7 @@ + #include <string.h> + #include <errno.h> + +-#if defined(WIN32) ++#if defined(WIN32) && !defined(__CYGWIN__) + #include <io.h> + #define snprintf _snprintf + #define access _access +@@ -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()); + } +@@ -1301,5 +1301,5 @@ + + + // +-// End of "$Id: DiffWindow.cxx 407 2006-11-13 18:54:02Z mike $". ++// End of "$Id$". + // _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
