[arch-commits] Commit in fldiff/repos (12 files)

Sergej Pupykin spupykin at archlinux.org
Mon Dec 1 11:00:49 UTC 2014


    Date: Monday, December 1, 2014 @ 12:00:48
  Author: spupykin
Revision: 123320

archrelease: copy trunk to community-i686, community-x86_64

Added:
  fldiff/repos/community-i686/PKGBUILD
    (from rev 123319, fldiff/trunk/PKGBUILD)
  fldiff/repos/community-i686/build-fix.patch
    (from rev 123319, fldiff/trunk/build-fix.patch)
  fldiff/repos/community-i686/fldiff.install
    (from rev 123319, fldiff/trunk/fldiff.install)
  fldiff/repos/community-x86_64/PKGBUILD
    (from rev 123319, fldiff/trunk/PKGBUILD)
  fldiff/repos/community-x86_64/build-fix.patch
    (from rev 123319, fldiff/trunk/build-fix.patch)
  fldiff/repos/community-x86_64/fldiff.install
    (from rev 123319, fldiff/trunk/fldiff.install)
Deleted:
  fldiff/repos/community-i686/PKGBUILD
  fldiff/repos/community-i686/build-fix.patch
  fldiff/repos/community-i686/fldiff.install
  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                 |   36 +++++++++++++++++++++
 /fldiff.install                  |   22 +++++++++++++
 community-i686/PKGBUILD          |   31 ------------------
 community-i686/build-fix.patch   |   18 ----------
 community-i686/fldiff.install    |   11 ------
 community-x86_64/PKGBUILD        |   31 ------------------
 community-x86_64/build-fix.patch |   18 ----------
 community-x86_64/fldiff.install  |   11 ------
 9 files changed, 120 insertions(+), 120 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2014-12-01 11:00:30 UTC (rev 123319)
+++ community-i686/PKGBUILD	2014-12-01 11:00:48 UTC (rev 123320)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: kevin <kevin at archlinux.org>
-# Contributor: iztok pizorn <pizorn at gmail.com>
-
-pkgname=fldiff
-pkgver=1.1
-pkgrel=8
-pkgdesc="graphical diff program"
-arch=(i686 x86_64)
-url="http://directory.fsf.org/wiki/Fldiff"
-license=('GPL')
-install=fldiff.install
-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
-}

Copied: fldiff/repos/community-i686/PKGBUILD (from rev 123319, fldiff/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2014-12-01 11:00:48 UTC (rev 123320)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: kevin <kevin at archlinux.org>
+# Contributor: iztok pizorn <pizorn at gmail.com>
+
+pkgname=fldiff
+pkgver=1.1
+pkgrel=9
+pkgdesc="graphical diff program"
+arch=(i686 x86_64)
+url="http://directory.fsf.org/wiki/Fldiff"
+license=('GPL')
+install=fldiff.install
+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
+}

Deleted: community-i686/build-fix.patch
===================================================================
--- community-i686/build-fix.patch	2014-12-01 11:00:30 UTC (rev 123319)
+++ community-i686/build-fix.patch	2014-12-01 11:00:48 UTC (rev 123320)
@@ -1,18 +0,0 @@
-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());
- }

Copied: fldiff/repos/community-i686/build-fix.patch (from rev 123319, fldiff/trunk/build-fix.patch)
===================================================================
--- community-i686/build-fix.patch	                        (rev 0)
+++ community-i686/build-fix.patch	2014-12-01 11:00:48 UTC (rev 123320)
@@ -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());
+ }

Deleted: community-i686/fldiff.install
===================================================================
--- community-i686/fldiff.install	2014-12-01 11:00:30 UTC (rev 123319)
+++ community-i686/fldiff.install	2014-12-01 11:00:48 UTC (rev 123320)
@@ -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-i686/fldiff.install (from rev 123319, fldiff/trunk/fldiff.install)
===================================================================
--- community-i686/fldiff.install	                        (rev 0)
+++ community-i686/fldiff.install	2014-12-01 11:00:48 UTC (rev 123320)
@@ -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
+}

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2014-12-01 11:00:30 UTC (rev 123319)
+++ community-x86_64/PKGBUILD	2014-12-01 11:00:48 UTC (rev 123320)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: kevin <kevin at archlinux.org>
-# Contributor: iztok pizorn <pizorn at gmail.com>
-
-pkgname=fldiff
-pkgver=1.1
-pkgrel=8
-pkgdesc="graphical diff program"
-arch=(i686 x86_64)
-url="http://directory.fsf.org/wiki/Fldiff"
-license=('GPL')
-install=fldiff.install
-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
-}

Copied: fldiff/repos/community-x86_64/PKGBUILD (from rev 123319, fldiff/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2014-12-01 11:00:48 UTC (rev 123320)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: kevin <kevin at archlinux.org>
+# Contributor: iztok pizorn <pizorn at gmail.com>
+
+pkgname=fldiff
+pkgver=1.1
+pkgrel=9
+pkgdesc="graphical diff program"
+arch=(i686 x86_64)
+url="http://directory.fsf.org/wiki/Fldiff"
+license=('GPL')
+install=fldiff.install
+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
+}

Deleted: community-x86_64/build-fix.patch
===================================================================
--- community-x86_64/build-fix.patch	2014-12-01 11:00:30 UTC (rev 123319)
+++ community-x86_64/build-fix.patch	2014-12-01 11:00:48 UTC (rev 123320)
@@ -1,18 +0,0 @@
-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());
- }

Copied: fldiff/repos/community-x86_64/build-fix.patch (from rev 123319, fldiff/trunk/build-fix.patch)
===================================================================
--- community-x86_64/build-fix.patch	                        (rev 0)
+++ community-x86_64/build-fix.patch	2014-12-01 11:00:48 UTC (rev 123320)
@@ -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());
+ }

Deleted: community-x86_64/fldiff.install
===================================================================
--- community-x86_64/fldiff.install	2014-12-01 11:00:30 UTC (rev 123319)
+++ community-x86_64/fldiff.install	2014-12-01 11:00:48 UTC (rev 123320)
@@ -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 123319, fldiff/trunk/fldiff.install)
===================================================================
--- community-x86_64/fldiff.install	                        (rev 0)
+++ community-x86_64/fldiff.install	2014-12-01 11:00:48 UTC (rev 123320)
@@ -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
+}



More information about the arch-commits mailing list