Date: Monday, February 4, 2013 @ 12:05:24 Author: spupykin Revision: 83678
archrelease: copy trunk to community-x86_64 Added: fldiff/repos/community-x86_64/PKGBUILD (from rev 83677, fldiff/trunk/PKGBUILD) fldiff/repos/community-x86_64/build-fix.patch (from rev 83677, fldiff/trunk/build-fix.patch) fldiff/repos/community-x86_64/fldiff.install (from rev 83677, fldiff/trunk/fldiff.install) Deleted: fldiff/repos/community-x86_64/PKGBUILD fldiff/repos/community-x86_64/build-fix.patch fldiff/repos/community-x86_64/fldiff.install -----------------+ PKGBUILD | 62 +++++++++++++++++++++++++++--------------------------- build-fix.patch | 62 +++++++++++++++++++++++++++--------------------------- fldiff.install | 22 +++++++++---------- 3 files changed, 73 insertions(+), 73 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2013-02-04 11:05:12 UTC (rev 83677) +++ PKGBUILD 2013-02-04 11:05:24 UTC (rev 83678) @@ -1,31 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Maintainer: kevin <ke...@archlinux.org> -# Contributor: iztok pizorn <piz...@gmail.com> - -pkgname=fldiff -pkgver=1.1 -pkgrel=7 -pkgdesc="graphical diff program" -arch=(i686 x86_64) -url="http://www.easysw.com/~mike/fldiff/" -license=('GPL') -install=fldiff.install -depends=('diffutils' 'fltk' 'xdg-utils') -source=(http://www.easysw.com/~mike/fldiff/$pkgname-$pkgver-source.tar.gz - build-fix.patch) -md5sums=('12897c92106fb5d665210a2e82f5cf25' - 'ea7258e07544b81561c6d76a41c184e7') - -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` $startdir/pkg/usr/share/applications -} Copied: fldiff/repos/community-x86_64/PKGBUILD (from rev 83677, fldiff/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2013-02-04 11:05:24 UTC (rev 83678) @@ -0,0 +1,31 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Maintainer: kevin <ke...@archlinux.org> +# Contributor: iztok pizorn <piz...@gmail.com> + +pkgname=fldiff +pkgver=1.1 +pkgrel=7 +pkgdesc="graphical diff program" +arch=(i686 x86_64) +url="http://www.easysw.com/~mike/fldiff/" +license=('GPL') +install=fldiff.install +depends=('diffutils' 'fltk' 'xdg-utils') +source=(http://www.easysw.com/~mike/fldiff/$pkgname-$pkgver-source.tar.gz + build-fix.patch) +md5sums=('12897c92106fb5d665210a2e82f5cf25' + 'ea7258e07544b81561c6d76a41c184e7') + +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 +} Deleted: build-fix.patch =================================================================== --- build-fix.patch 2013-02-04 11:05:12 UTC (rev 83677) +++ build-fix.patch 2013-02-04 11:05:24 UTC (rev 83678) @@ -1,31 +0,0 @@ -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 Copied: fldiff/repos/community-x86_64/build-fix.patch (from rev 83677, fldiff/trunk/build-fix.patch) =================================================================== --- build-fix.patch (rev 0) +++ build-fix.patch 2013-02-04 11:05:24 UTC (rev 83678) @@ -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 Deleted: fldiff.install =================================================================== --- fldiff.install 2013-02-04 11:05:12 UTC (rev 83677) +++ fldiff.install 2013-02-04 11:05:24 UTC (rev 83678) @@ -1,11 +0,0 @@ -post_install() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} Copied: fldiff/repos/community-x86_64/fldiff.install (from rev 83677, fldiff/trunk/fldiff.install) =================================================================== --- fldiff.install (rev 0) +++ fldiff.install 2013-02-04 11:05:24 UTC (rev 83678) @@ -0,0 +1,11 @@ +post_install() { + which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true +}