Arch Linux

Bjørn

Member

From: The Netherlands

Registered: 2004-03-18

Posts: 139

Website

xxdiff and tmake

I recently tried xxdiff, and think it's an amazing nice and fast program to look at differences between files and directories. To build it I needed to install tmake, which has been surpassed by qmake but is apparently still used by some software in the build process.

xxdiff:
http://xxdiff.sourceforge.net/

tmake:
http://www.trolltech.com/download/tmake.html

I could only find binary of tmake, while they say source is included I couldn't find it. But I think the license isn't a problem for making a package from it. I guess package needs to be make a bit manually though.

---

http://themanaworld.org/
A Free Real-time Massively Multiplayer Online RPG in development.

oz

Member

Registered: 2004-05-20

Posts: 102

Re: xxdiff and tmake

My favorite graphical diff and my favorite 3-way merger.

PKGBUILD:

# Contributor: Chris Osgood <archlinux at functionalfuture.com>
pkgname=xxdiff
pkgver=3.0.2
pkgrel=1
pkgdesc="Graphical File And Directories Comparator And Merge Tool"
url="http://xxdiff.sourceforge.net/"
license="GPL"
depends=('qt' 'diffutils' 'kdelibs' 'python')
makedepends=('tmake')
source=(http://dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
md5sums=('3c3eeedc2c710a43794894d29c1d5db7')

build() {
  cd $startdir/src/$pkgname-$pkgver/src
  patch -Np0 -i ../../../xxdiff.patch
  export TMAKEPATH=/usr/lib/tmake/linux-g++
  tmake xxdiff.pro > Makefile
  make || return 1
  mkdir -p $startdir/pkg/usr
  mv $startdir/src/$pkgname-$pkgver/bin $startdir/pkg/usr
}

Additional stuff:

xxdiff.patch:  (used to allow makepkg to work)

--- xxdiff.pro_orig     2004-01-30 17:31:22.000000000 -0500
+++ xxdiff.pro  2004-08-19 10:24:06.000000000 -0400
@@ -89,8 +89,8 @@
 # Max OS X with XFree86 port, macx-g++
 #

-macx-g++:TMAKE_CXXFLAGS += -D__GNU_LIBRARY__
-macx-g++:TMAKE_CXXFLAGS -= -fno-exceptions
+#macx-g++:TMAKE_CXXFLAGS += -D__GNU_LIBRARY__
+#macx-g++:TMAKE_CXXFLAGS -= -fno-exceptions

Bjørn

Member

From: The Netherlands

Registered: 2004-03-18

Posts: 139

Website

Re: xxdiff and tmake

Thanks a lot, also for the tmake package. Worked nicely. :-)

---

http://themanaworld.org/
A Free Real-time Massively Multiplayer Online RPG in development.